diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-14 23:54:16 +0800 |
---|---|---|
committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-14 23:54:16 +0800 |
commit | b27e8e87f8be2d11468e9057254b6c8933e0af33 (patch) | |
tree | bbfb32d7e248ae6f2ec63164722523d96447848a /templates | |
parent | 607303e4dee3ddf9ba3d9d67b0186fc5213b167b (diff) | |
parent | d18237850c6a4ae855b3f8592994c91462fcdb0a (diff) | |
download | gitea-b27e8e87f8be2d11468e9057254b6c8933e0af33.tar.gz gitea-b27e8e87f8be2d11468e9057254b6c8933e0af33.zip |
add tree view
Diffstat (limited to 'templates')
-rw-r--r-- | templates/repo/nav.tmpl | 11 | ||||
-rw-r--r-- | templates/repo/single.tmpl | 59 | ||||
-rw-r--r-- | templates/repo/toolbar.tmpl | 60 | ||||
-rw-r--r-- | templates/status/200.tmpl (renamed from templates/base/error.tmpl) | 0 | ||||
-rw-r--r-- | templates/user/delete.tmpl | 6 | ||||
-rw-r--r-- | templates/user/notification.tmpl | 19 | ||||
-rw-r--r-- | templates/user/password.tmpl | 51 | ||||
-rw-r--r-- | templates/user/profile.tmpl | 12 | ||||
-rw-r--r-- | templates/user/publickey.tmpl | 6 | ||||
-rw-r--r-- | templates/user/publickey_add.tmpl | 26 | ||||
-rw-r--r-- | templates/user/publickey_added.tmpl | 8 | ||||
-rw-r--r-- | templates/user/publickey_list.tmpl | 12 | ||||
-rw-r--r-- | templates/user/security.tmpl | 19 | ||||
-rw-r--r-- | templates/user/setting.tmpl | 49 | ||||
-rw-r--r-- | templates/user/signup.tmpl | 2 |
15 files changed, 236 insertions, 104 deletions
diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl index 5d60d46107..1a9434e860 100644 --- a/templates/repo/nav.tmpl +++ b/templates/repo/nav.tmpl @@ -1,6 +1,17 @@ <div id="gogs-body-nav" class="gogs-repo-nav"> <div class="container"> <div class="gogs-repo-btns pull-right"> + <div class="btn-group" id="gogs-repo-clone"> + <button type="button" class="btn btn-default"><i class="fa fa-download"></i>Clone</button> + <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> + <span class="caret"></span> + <span class="sr-only">Toggle Dropdown</span> + </button> + <div class="dropdown-menu" role="menu"> + <div data-val="down-http">http link</div> + <div data-val="down-git">git link</div> + </div> + </div> <div class="btn-group" id="gogs-repo-watching"> <button type="button" class="btn btn-default"><i class="fa fa-eye"></i>Watch {x}</button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> diff --git a/templates/repo/single.tmpl b/templates/repo/single.tmpl index c83fcd93cd..292f8cbddd 100644 --- a/templates/repo/single.tmpl +++ b/templates/repo/single.tmpl @@ -3,11 +3,58 @@ {{template "repo/nav" .}} {{template "repo/toolbar" .}} <div id="gogs-body" class="container"> - <h4>Source Files:</h4> - <ul> - {{range .Files}} - <li>{{.Name}} - {{.Id}} - {{.Message}} - {{.Created}} - {{.IsFile}} - {{.IsDir}}</li> - {{end}} - </ul> + <div id="gogs-source"> + <div id="gogs-source-toolbar"> + <button class="btn btn-default pull-right"><i class="fa fa-plus-square"></i>Add File</button> + <div class="dropdown branch-switch"> + <a href="#" class="btn btn-success dropdown-toggle" data-toggle="dropdown"><i class="fa fa-chain"></i>master + <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a class="current" href="/{{.RepositoryLink}}/branch/master">master</a></li> + <li><a href="//{{.RepositoryLink}}/branch/develop">develop</a></li> + </ul> + </div> + <ol class="breadcrumb"> + <li class="root dir">{{.Repository.Name}}</li> + {{$paths := .Paths}} + {{ $username := .Username}} + {{ $reponame := .Reponame}} + {{ $branchname := .Branchname}} + {{ $treenames := .Treenames}} + {{ $n := len $treenames}} + {{ $l := Subtract $n 1}} + {{range $i, $v := $treenames}} + <li class="dir"> + {{if eq $i $l}}{{$v}} + {{else}} + <a href="/{{$username}}/{{$reponame}}/tree/{{$branchname}}/{{index $paths $i}}">{{$v}}</a> + {{end}}</li> + {{end}} + </ol> + </div> + <table id="gogs-source-table" class="table table-hover"> + <thead class="hidden"> + <tr> + <th class="name">Filename</th> + <th class="date">Date modified</th> + <th class="text">Message</th> + </tr> + </thead> + <tbody> + {{range .Files}} + <tr {{if .IsDir}}class="is-dir"{{end}}> + <td class="name"><i class="fa {{if .IsDir}}fa-folder{{else}}fa-file{{end}}"></i> + {{if .IsDir}} + <a href="/{{$username}}/{{$reponame}}/tree/{{$branchname}}/{{.Path}}">{{.Name}}</a> + {{else}} + <a href="#">{{.Name}}</a> + {{end}}</td> + <td class="date"><time datetime="{{.Created}}" data-title="true" title="{{.Created}}">{{TimeSince .Created}}</time></td> + <td class="text">{{.Message}}</td> + </tr> + {{end}} + </tbody> + </table> + </div> </div> {{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/toolbar.tmpl b/templates/repo/toolbar.tmpl index a409fcbea7..4a0b60adad 100644 --- a/templates/repo/toolbar.tmpl +++ b/templates/repo/toolbar.tmpl @@ -1,40 +1,32 @@ <div id="gogs-repo-toolbar"> <div class="container"> <nav class="navbar navbar-toolbar navbar-default" role="navigation"> - <div class="container-fluid"> - <div class="collapse navbar-collapse"> - <ul class="nav navbar-nav"> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Branches <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="#">master</a></li> - <li><a href="#">develop</a></li> - </ul> - </li> - <li class="{{if .IsRepoToolbarSource}}active{{end}}"><a href="/{{.RepositoryLink}}">Source</a></li> - <li><a href="#">Commits</a></li> - <li><a href="#">Issues <span class="badge">42</span></a></li> - <li><a href="#">Pull Requests</a></li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="#">Release</a></li> - <li><a href="#">Wiki</a></li> - </ul> - </li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Statistic <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="#">Graphic</a></li> - <li><a href="#">Pulse</a></li> - <li><a href="#">Network</a></li> - </ul> - </li>{{if .IsRepositoryOwner}} - <li class="{{if .IsRepoToolbarSetting}}active{{end}}"><a href="/{{.RepositoryLink}}/settings">Settings</a></li>{{end}} - </ul> - </div> + <div class="collapse navbar-collapse"> + <ul class="nav navbar-nav"> + <li class="{{if .IsRepoToolbarSource}}active{{end}}"><a href="/{{.RepositoryLink}}">Source</a></li> + <li><a href="/{{.RepositoryLink}}/commits">Commits</a></li> + <li><a href="/{{.RepositoryLink}}/issues">Issues <!--<span class="badge">42</span>--></a></li> + <li><a href="/{{.RepositoryLink}}/pulls">Pull Requests</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">More <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="/{{.RepositoryLink}}/release">Release</a></li> + <li><a href="//{{.RepositoryLink}}/wiki">Wiki</a></li> + </ul> + </li> + </ul> + <ul class="nav navbar-nav navbar-right"> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown">Statistic <b class="caret"></b></a> + <ul class="dropdown-menu"> + <li><a href="#">Graphic</a></li> + <li><a href="#">Pulse</a></li> + <li><a href="#">Network</a></li> + </ul> + </li>{{if .IsRepositoryOwner}} + <li class="{{if .IsRepoToolbarSetting}}active{{end}}"><a href="/{{.RepositoryLink}}/settings">Settings</a> + </li>{{end}} + </ul> </div> </nav> </div> diff --git a/templates/base/error.tmpl b/templates/status/200.tmpl index 8f64494201..8f64494201 100644 --- a/templates/base/error.tmpl +++ b/templates/status/200.tmpl diff --git a/templates/user/delete.tmpl b/templates/user/delete.tmpl index af0e1fbc06..904201772e 100644 --- a/templates/user/delete.tmpl +++ b/templates/user/delete.tmpl @@ -5,10 +5,10 @@ <h4>Account Setting</h4> <ul class="list-group"> <li class="list-group-item"><a href="/user/setting">Account Profile</a></li> - <li class="list-group-item"><a href="#">Emails and Password</a></li> - <li class="list-group-item"><a href="#">Notifications</a></li> + <li class="list-group-item"><a href="/user/setting/password">Password</a></li> + <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li> <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li> - <li class="list-group-item"><a href="#">Security</a></li> + <li class="list-group-item"><a href="/user/setting/security">Security</a></li> <li class="list-group-item list-group-item-success"><a href="/user/delete">Delete Account</a></li> </ul> </div> diff --git a/templates/user/notification.tmpl b/templates/user/notification.tmpl new file mode 100644 index 0000000000..c1abc46fb0 --- /dev/null +++ b/templates/user/notification.tmpl @@ -0,0 +1,19 @@ +{{template "base/head" .}} +{{template "base/navbar" .}} +<div id="gogs-body" class="container"> + <div id="gogs-user-setting-nav" class="col-md-3"> + <h4>Account Setting</h4> + <ul class="list-group"> + <li class="list-group-item"><a href="/user/setting">Account Profile</a></li> + <li class="list-group-item"><a href="/user/setting/password">Password</a></li> + <li class="list-group-item list-group-item-success"><a href="/user/setting/notification">Notifications</a></li> + <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li> + <li class="list-group-item"><a href="/user/setting/security">Security</a></li> + <li class="list-group-item"><a href="/user/delete">Delete Account</a></li> + </ul> + </div> + <div id="gogs-user-setting-container" class="col-md-9"> + <h4>Notification</h4> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/user/password.tmpl b/templates/user/password.tmpl new file mode 100644 index 0000000000..a8b1e21e04 --- /dev/null +++ b/templates/user/password.tmpl @@ -0,0 +1,51 @@ +{{template "base/head" .}} +{{template "base/navbar" .}} +<div id="gogs-body" class="container"> + <div id="gogs-user-setting-nav" class="col-md-3"> + <h4>Account Setting</h4> + <ul class="list-group"> + <li class="list-group-item"><a href="/user/setting">Account Profile</a></li> + <li class="list-group-item list-group-item-success"><a href="/user/setting/password">Password</a></li> + <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li> + <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li> + <li class="list-group-item"><a href="/user/setting/security">Security</a></li> + <li class="list-group-item"><a href="/user/delete">Delete Account</a></li> + </ul> + </div> + <div id="gogs-user-setting-container" class="col-md-9"> + <div id="gogs-setting-pwd"> + <h4>Password</h4> + <form class="form-horizontal" id="gogs-password-form" method="post" action="/user/setting/password">{{if .IsSuccess}} + <p class="alert alert-success">Password is changed successfully. You can now sign in via new password.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}} + <div class="form-group"> + <label class="col-md-2 control-label">Old Password<strong class="text-danger">*</strong></label> + <div class="col-md-8"> + <input type="password" name="oldpasswd" class="form-control" placeholder="Type your current password" required="required"> + </div> + </div> + + <div class="form-group"> + <label class="col-md-2 control-label">New Password<strong class="text-danger">*</strong></label> + <div class="col-md-8"> + <input type="password" name="newpasswd" class="form-control" placeholder="Type your new password" required="required"> + </div> + </div> + + <div class="form-group"> + <label class="col-md-2 control-label">Re-Type<strong class="text-danger">*</strong></label> + <div class="col-md-8"> + <input type="password" name="retypepasswd" class="form-control" placeholder="Re-type your new password" required="required"> + </div> + </div> + + <div class="form-group"> + <div class="col-md-offset-2 col-md-8"> + <button type="submit" class="btn btn-primary">Change Password</button> + <a href="/forget-password/">Forgot your password?</a> + </div> + </div> + </form> + </div> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 79e6062bcb..c10bfcb0f3 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -4,16 +4,16 @@ <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/{{.Avatar}}?s=200" alt="user-avatar" title="username"/> + <img id="gogs-user-avatar" src="http://1.gravatar.com/avatar/{{.Owner.Avatar}}?s=200" alt="user-avatar" title="username"/> </a> - <span id="gogs-user-name" class="center-block" href="#">{{.Username}}</span> + <span id="gogs-user-name" class="center-block" href="#">{{.Owner.Name}}</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> + <li class="list-group-item"><i class="fa fa-thumb-tack"></i>{{.Owner.Location}}</li> + <li class="list-group-item"><i class="fa fa-envelope"></i><a href="mailto:{{.Owner.Email}}">{{.Owner.Email}}</a></li> + <li class="list-group-item"><i class="fa fa-link"></i><a target="_blank" href="{{.Owner.Website}}">{{.Owner.Website}}</a></li> + <li class="list-group-item"><i class="fa fa-clock-o"></i>{{.Owner.Created}}</li> </ul> </div> </div> diff --git a/templates/user/publickey.tmpl b/templates/user/publickey.tmpl index 0bd76593e7..60d2c2464a 100644 --- a/templates/user/publickey.tmpl +++ b/templates/user/publickey.tmpl @@ -5,10 +5,10 @@ <h4>Account Setting</h4> <ul class="list-group"> <li class="list-group-item"><a href="/user/setting">Account Profile</a></li> - <li class="list-group-item"><a href="#">Emails and Password</a></li> - <li class="list-group-item"><a href="#">Notifications</a></li> + <li class="list-group-item"><a href="/user/setting/Password">Password</a></li> + <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li> <li class="list-group-item list-group-item-success"><a href="/user/setting/ssh/">SSH Keys</a></li> - <li class="list-group-item"><a href="#">Security</a></li> + <li class="list-group-item"><a href="/user/setting/security">Security</a></li> <li class="list-group-item"><a href="/user/delete">Delete Account</a></li> </ul> </div> diff --git a/templates/user/publickey_add.tmpl b/templates/user/publickey_add.tmpl deleted file mode 100644 index 634b859ddd..0000000000 --- a/templates/user/publickey_add.tmpl +++ /dev/null @@ -1,26 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -<div class="container" id="gogs-body"> - <form action="/user/publickey/add" method="post" class="form-horizontal"> - <div class="form-group"> - <label class="col-md-4 control-label">Name of this public key: </label> - <div class="col-md-3"> - <input name="keyname" class="form-control" placeholder="Type your preferred name" value="{{.KeyName}}"> - </div> - </div> - - <div class="form-group"> - <label class="col-md-4 control-label">Paste your key here: </label> - <div class="col-md-3"> - <textarea name="key_content" cols="30" rows="10" class="form-control">{{.KeyContent}}</textarea> - </div> - </div> - - <div class="form-group"> - <div class="col-md-offset-4 col-md-3"> - <button type="submit" class="btn btn-info">Add public key</button> - </div> - </div> - </form> -</div> -{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/user/publickey_added.tmpl b/templates/user/publickey_added.tmpl deleted file mode 100644 index f67da9ed85..0000000000 --- a/templates/user/publickey_added.tmpl +++ /dev/null @@ -1,8 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -<div class="container"> - <div class="form-group"> - publickey added - </div> -</div> -{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/user/publickey_list.tmpl b/templates/user/publickey_list.tmpl deleted file mode 100644 index fbd640b4bf..0000000000 --- a/templates/user/publickey_list.tmpl +++ /dev/null @@ -1,12 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -<div class="container" id="gogs-body"> -<div><a href="/user/publickey/add">Add publick key</a></div> - <ul> - {{range .Keys}} - <li>{{.Name}}</li> - <li>{{.Content}}</li> - {{end}} - </ul> -</div> -{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/user/security.tmpl b/templates/user/security.tmpl new file mode 100644 index 0000000000..37cd5872aa --- /dev/null +++ b/templates/user/security.tmpl @@ -0,0 +1,19 @@ +{{template "base/head" .}} +{{template "base/navbar" .}} +<div id="gogs-body" class="container"> + <div id="gogs-user-setting-nav" class="col-md-3"> + <h4>Account Setting</h4> + <ul class="list-group"> + <li class="list-group-item"><a href="/user/setting">Account Profile</a></li> + <li class="list-group-item"><a href="/user/setting/password">Password</a></li> + <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li> + <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li> + <li class="list-group-item list-group-item-success"><a href="/user/setting/security">Security</a></li> + <li class="list-group-item"><a href="/user/delete">Delete Account</a></li> + </ul> + </div> + <div id="gogs-user-setting-container" class="col-md-9"> + <h4>Security</h4> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl index 79de58fe75..edbeeb22a9 100644 --- a/templates/user/setting.tmpl +++ b/templates/user/setting.tmpl @@ -5,15 +5,54 @@ <h4>Account Setting</h4> <ul class="list-group"> <li class="list-group-item list-group-item-success"><a href="/user/setting">Account Profile</a></li> - <li class="list-group-item"><a href="#">Emails and Password</a></li> - <li class="list-group-item"><a href="#">Notifications</a></li> - <li class="list-group-item"><a href="/user/setting/ssh">SSH Keys</a></li> - <li class="list-group-item"><a href="#">Security</a></li> + <li class="list-group-item"><a href="/user/setting/password">Password</a></li> + <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li> + <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li> + <li class="list-group-item"><a href="/user/setting/security">Security</a></li> <li class="list-group-item"><a href="/user/delete">Delete Account</a></li> </ul> </div> <div id="gogs-user-setting-container" class="col-md-9"> - setting container + <div id="gogs-setting-pwd"> + <h4>Account Profile</h4> + <form class="form-horizontal" id="gogs-password-form" method="post" action="/user/setting">{{if .IsSuccess}} + <p class="alert alert-success">Your profile has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}} + <p>Your Email will be public and used for Account related notifications and any web based operations made via the web.</p> + <div class="form-group"> + <label class="col-md-2 control-label">Email</label> + <div class="col-md-8"> + <input type="text" name="email" class="form-control" placeholder="Type your e-mail address" value="{{.Owner.Email}}"> + </div> + </div> + + <div class="form-group"> + <label class="col-md-2 control-label">Website</label> + <div class="col-md-8"> + <input type="text" name="website" class="form-control" placeholder="Type your website URL" value="{{.Owner.Website}}"> + </div> + </div> + + <div class="form-group"> + <label class="col-md-2 control-label">Location</label> + <div class="col-md-8"> + <input type="text" name="location" class="form-control" placeholder="Type your current location" value="{{.Owner.Location}}"> + </div> + </div> + + <div class="form-group"> + <label class="col-md-2 control-label">Gravatar Email<strong class="text-danger">*</strong></label> + <div class="col-md-8"> + <input type="text" name="avatar" class="form-control" placeholder="Type your Gravatar e-mail address" required="required" value="{{.Owner.AvatarEmail}}"> + </div> + </div> + + <div class="form-group"> + <div class="col-md-offset-2 col-md-8"> + <button type="submit" class="btn btn-primary">Update Profile</button> + </div> + </div> + </form> + </div> </div> </div> {{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl index ba41b0c9bb..2f1e82c730 100644 --- a/templates/user/signup.tmpl +++ b/templates/user/signup.tmpl @@ -7,7 +7,7 @@ <div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}"> <label class="col-md-4 control-label">Username: </label> <div class="col-md-6"> - <input name="username" class="form-control" placeholder="Type your username" value="{{.username}}" required="required" title="Username must contain at least 5 characters"> + <input name="username" class="form-control" placeholder="Type your username" value="{{.username}}" required="required"> </div> </div> |