diff options
| author | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-03-02 21:47:55 +0800 |
|---|---|---|
| committer | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-03-02 21:47:55 +0800 |
| commit | ffe0ba562c2d749ea904e7171b424ae251c1f62e (patch) | |
| tree | 24e94937d2baa40088f0f0813e1081f696977218 | |
| parent | ffcfd428b8372b3b5fafc70acf2ecc189bd7712e (diff) | |
| download | gitea-ffe0ba562c2d749ea904e7171b424ae251c1f62e.tar.gz gitea-ffe0ba562c2d749ea904e7171b424ae251c1f62e.zip | |
ui for user/profile page, only skeleton
| -rwxr-xr-x | public/css/gogs.css | 60 | ||||
| -rw-r--r-- | public/js/app.js | 17 | ||||
| -rw-r--r-- | routers/user/user.go | 7 | ||||
| -rw-r--r-- | templates/base/head.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/delete.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/profile.tmpl | 37 | ||||
| -rw-r--r-- | templates/user/signup.tmpl | 2 | ||||
| -rw-r--r-- | web.go | 1 |
8 files changed, 125 insertions, 3 deletions
diff --git a/public/css/gogs.css b/public/css/gogs.css index 68c2b8a41b..39796f6e39 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -8,6 +8,22 @@ body { background: #F6F6F6; } +/* override bs3 */ + +.tooltip-inner{ + border-radius: 3px; + background: #333; + border: none; +} + +.tooltip-arrow{ + border-bottom-color: #333 !important; +} + +.fa{ + margin: 0 .5em; +} + /* gogits nav header */ .gogs-masthead { background-color: #428bca; @@ -110,4 +126,48 @@ body { #gogs-social-login .btn{ float: none; margin: auto; +} + +/* gogs-user-profile */ + +#gogs-user-avatar{ + width: 200px; + height: 200px; + border-radius: 6px; +} + +#gogs-user-name{ + margin-top: 20px; + font-size: 1.6em; + font-weight: bold; + margin-bottom: 20px; +} + +#gogs-user-profile .profile-info .list-group-item{ + background-color: transparent; + padding-top: 18px; + color: #666; +} + +#gogs-user-profile .profile-info .list-group-item a{ + margin: 0; + padding: 0; + display: inline; + color: #0093c4; +} + +#gogs-user-profile .profile-info .list-group{ + border-top: 1px solid #ccc; + padding-bottom: 18px; + border-bottom: 1px solid #ccc; + padding-left: 18px; + padding-right: 18px; +} + +#gogs-user-activity .tab-pane{ + padding: 20px; +} + +#gogs-user-act-tabs li.active a{ + border-bottom-color: #ddd; }
\ No newline at end of file diff --git a/public/js/app.js b/public/js/app.js new file mode 100644 index 0000000000..a8220f46e1 --- /dev/null +++ b/public/js/app.js @@ -0,0 +1,17 @@ +var Gogits = {}; + +(function($){ + Gogits.showTooltips = function(){ + $("body").tooltip({ + selector: "[data-toggle=tooltip]" + //container: "body" + }); + }; + Gogits.showTab = function (selector, index) { + if (!index) { + index = 0; + } + $(selector).tab("show"); + $(selector).find("li:eq(" + index + ") a").tab("show"); + } +})(jQuery);
\ No newline at end of file diff --git a/routers/user/user.go b/routers/user/user.go index 241a9f3589..7cd8bca550 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -16,6 +16,13 @@ import ( "github.com/gogits/gogs/utils/log" ) +func Profile(r render.Render) { + r.HTML(200, "user/profile", map[string]interface{}{ + "Title": "Username", + }) + return +} + func SignIn(req *http.Request, r render.Render) { if req.Method == "GET" { r.HTML(200, "user/signin", map[string]interface{}{ diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index ac0b9594e6..4358bf02bf 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -15,7 +15,7 @@ <script src="/js/jquery-1.10.1.min.js"></script> <script src="/js/bootstrap.min.js"></script> - + <script src="/js/app.js"></script> <title>{{.Title}} | {{AppName}}</title> </head> <body> diff --git a/templates/user/delete.tmpl b/templates/user/delete.tmpl index 55993633db..939048b421 100644 --- a/templates/user/delete.tmpl +++ b/templates/user/delete.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}} {{template "base/navbar" .}} -<div class="container"> +<div class="container" id="gogs-body"> <form action="/user/delete" method="post" class="form-horizontal"> <div class="form-group"> <div class="col-md-offset-4 col-md-3"> diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl new file mode 100644 index 0000000000..f32601001d --- /dev/null +++ b/templates/user/profile.tmpl @@ -0,0 +1,37 @@ +{{template "base/head" .}} +{{template "base/navbar" .}} +<div id="gogs-body" class="container"> + <div id="gogs-user-profile" class="col-md-3"> + <div class="profile-avatar text-center"> + <a href="#" class="center-block" data-toggle="tooltip" data-placement="bottom" title="Change Avatar"> + <img id="gogs-user-avatar" src="http://1.gravatar.com/avatar/x?s=200" alt="user-avatar" title="username"/> + </a> + <span id="gogs-user-name" class="center-block" href="#">Username</span> + </div> + <div class="profile-info"> + <ul class="list-group"> + <li class="list-group-item"><i class="fa fa-thumb-tack"></i>City, County, State, Nation</li> + <li class="list-group-item"><i class="fa fa-envelope"></i><a href="#">Email@EmailAddress.com</a></li> + <li class="list-group-item"><i class="fa fa-link"></i><a href="#">http://yousite/</a></li> + <li class="list-group-item"><i class="fa fa-clock-o"></i>Joined At 03.02, 2014</li> + </ul> + </div> + </div> + <div id="gogs-user-activity" class="col-md-9"> + <ul class="nav nav-tabs" id="gogs-user-act-tabs"> + <li class="active"><a href="#repo" data-toggle="tab"><i class="fa fa-gittip"></i>Repositories</a></li> + <li><a href="#activity" data-toggle="tab"><i class="fa fa-rss"></i>Activity</a></li> + </ul> + <div class="tab-content"> + <div class="tab-pane active" id="repo">repo</div> + <div class="tab-pane" id="activity">activity</div> + </div> + </div> +</div> +<script> + $(function () { + Gogits.showTooltips(); + Gogits.showTab("#gogs-user-act-tabs"); + }); +</script> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl index 2e127a62ef..0bac3244a8 100644 --- a/templates/user/signup.tmpl +++ b/templates/user/signup.tmpl @@ -37,7 +37,7 @@ <div class="form-group"> <div class="col-md-offset-4 col-md-6"> - <a href="/sign-up">Already have an account? Sign in now!</a> + <a href="/login/">Already have an account? Sign in now!</a> </div> </div> </form> @@ -54,6 +54,7 @@ func runWeb(*cli.Context) { m.Any("/sign-up", user.SignUp) m.Any("/user/signup", user.SignUp) + m.Get("/user/profile", user.Profile) // should be /username m.Any("/user/delete", user.Delete) m.Any("/user/publickey/add", user.AddPublicKey) m.Any("/repo/create", repo.Create) |