summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/VERSION2
-rw-r--r--templates/admin/auth/edit.tmpl (renamed from templates/admin/auths/edit.tmpl)0
-rw-r--r--templates/admin/auth/new.tmpl (renamed from templates/admin/auths/new.tmpl)0
-rw-r--r--templates/admin/config.tmpl4
-rw-r--r--templates/admin/user/edit.tmpl (renamed from templates/admin/users/edit.tmpl)0
-rw-r--r--templates/admin/user/new.tmpl (renamed from templates/admin/users/new.tmpl)0
-rw-r--r--templates/mail/auth/active.tmpl (renamed from templates/mail/auth/active_email.tmpl)0
-rw-r--r--templates/org/edit_team.tmpl75
-rw-r--r--templates/org/members.tmpl56
-rw-r--r--templates/org/new.tmpl32
-rw-r--r--templates/org/new_team.tmpl74
-rw-r--r--templates/org/settings.tmpl130
-rw-r--r--templates/org/teams.tmpl71
-rw-r--r--templates/repo/branch.tmpl (renamed from templates/repo/branches.tmpl)0
-rw-r--r--templates/repo/create.tmpl32
-rw-r--r--templates/repo/hook_add.tmpl (renamed from templates/repo/hooks_add.tmpl)0
-rw-r--r--templates/repo/hook_edit.tmpl (renamed from templates/repo/hooks_edit.tmpl)0
-rw-r--r--templates/repo/issue/create.tmpl (renamed from templates/issue/create.tmpl)0
-rw-r--r--templates/repo/issue/list.tmpl (renamed from templates/issue/list.tmpl)0
-rw-r--r--templates/repo/issue/milestone.tmpl (renamed from templates/issue/milestone.tmpl)0
-rw-r--r--templates/repo/issue/milestone_edit.tmpl (renamed from templates/issue/milestone_edit.tmpl)0
-rw-r--r--templates/repo/issue/milestone_new.tmpl (renamed from templates/issue/milestone_new.tmpl)0
-rw-r--r--templates/repo/issue/view.tmpl (renamed from templates/issue/view.tmpl)0
-rw-r--r--templates/repo/migrate.tmpl32
-rw-r--r--templates/repo/release/edit.tmpl (renamed from templates/release/edit.tmpl)0
-rw-r--r--templates/repo/release/list.tmpl (renamed from templates/release/list.tmpl)0
-rw-r--r--templates/repo/release/new.tmpl (renamed from templates/release/new.tmpl)0
-rw-r--r--templates/user/dashboard.tmpl37
-rw-r--r--templates/user/issues.tmpl (renamed from templates/user/issue.tmpl)3
29 files changed, 532 insertions, 16 deletions
diff --git a/templates/VERSION b/templates/VERSION
index 7d143dcc1c..be0ebee0f5 100644
--- a/templates/VERSION
+++ b/templates/VERSION
@@ -1 +1 @@
-0.4.5.0621 Alpha \ No newline at end of file
+0.4.5.0627 Alpha \ No newline at end of file
diff --git a/templates/admin/auths/edit.tmpl b/templates/admin/auth/edit.tmpl
index a2c2ddc698..a2c2ddc698 100644
--- a/templates/admin/auths/edit.tmpl
+++ b/templates/admin/auth/edit.tmpl
diff --git a/templates/admin/auths/new.tmpl b/templates/admin/auth/new.tmpl
index abb88043ee..abb88043ee 100644
--- a/templates/admin/auths/new.tmpl
+++ b/templates/admin/auth/new.tmpl
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl
index 22be5900e3..10a53b5397 100644
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -36,8 +36,8 @@
<dd>{{.LogRootPath}}</dd>
<dt>Script Type</dt>
<dd>{{.ScriptType}}</dd>
- <dt>Reverse Authentication UID</dt>
- <dd>{{.ReverseProxyAuthUid}}</dd>
+ <dt>Reverse Authentication User</dt>
+ <dd>{{.ReverseProxyAuthUser}}</dd>
</dl>
</div>
</div>
diff --git a/templates/admin/users/edit.tmpl b/templates/admin/user/edit.tmpl
index b1fffb69c3..b1fffb69c3 100644
--- a/templates/admin/users/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
diff --git a/templates/admin/users/new.tmpl b/templates/admin/user/new.tmpl
index 4f4866c4b6..4f4866c4b6 100644
--- a/templates/admin/users/new.tmpl
+++ b/templates/admin/user/new.tmpl
diff --git a/templates/mail/auth/active_email.tmpl b/templates/mail/auth/active.tmpl
index 72d9948bd4..72d9948bd4 100644
--- a/templates/mail/auth/active_email.tmpl
+++ b/templates/mail/auth/active.tmpl
diff --git a/templates/org/edit_team.tmpl b/templates/org/edit_team.tmpl
new file mode 100644
index 0000000000..4292575c87
--- /dev/null
+++ b/templates/org/edit_team.tmpl
@@ -0,0 +1,75 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body-nav" class="org-nav org-nav-auto">
+ <div class="container clearfix">
+ <div id="org-nav-wrapper">
+ <ul class="nav nav-pills pull-right">
+ <li><a href="#"><i class="fa fa-users"></i>Members
+ <span class="label label-default">5</span></a>
+ </li>
+ <li class="active"><a href="#"><i class="fa fa-tags"></i>Teams
+ <span class="label label-default">2</span></a>
+ </li>
+ </ul>
+ <img class="pull-left org-small-logo" src="https://avatars3.githubusercontent.com/u/6656686?s=140" alt="" width="60"/>
+ <div id="org-nav-info">
+ <h2 class="org-name">Organization Name</h2>
+ </div>
+ </div>
+ </div>
+</div>
+<div id="body" class="container">
+ <div id="org">
+ <form id="org-teams-edit" class="form-horizontal card">
+ <h3>Edit team</h3>
+ <div class="form-group">
+ <label class="col-md-2 control-label">Team Name<strong class="text-danger">*</strong></label>
+ <div class="col-md-8">
+ <input name="team" type="text" class="form-control" placeholder="Type your team name" value="" required="required">
+ <span class="help-block">You'll use this name to mention this team in conversations.</span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-2 control-label">Description</label>
+ <div class="col-md-8">
+ <input name="desc" type="text" class="form-control" placeholder="Type your team description (optional)" value="">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-2 control-label">Permission</label>
+ <div class="col-md-8">
+ <div class="radio">
+ <label>
+ <input type="radio" name="permission" value="pull" checked="">
+ <strong>Read & Clone</strong>
+ </label>
+ <p>This team will be able to view and clone its repositories.</p>
+ </div>
+ <div class="radio">
+ <label>
+ <input type="radio" name="permission" value="push">
+ <strong>Push, Read & Clone</strong>
+ </label>
+ <p>This team will be able to read its repositories, as well as push to them.</p>
+ </div>
+ <div class="radio">
+ <label>
+ <input type="radio" name="permission" value="admin">
+ <strong>Collaboration, Push, Read & Clone</strong>
+ </label>
+ <p>This team will be able to push/pull to its repositories, as well as add other collaborators to them.</p>
+ </div>
+ </div>
+ </div>
+ <hr/>
+ <div class="form-group">
+ <label class="col-md-2">&nbsp;</label>
+ <div class="col-md-8">
+ <button class="btn btn-primary">Edit this team</button>
+ <button class="btn btn-danger pull-right" value="delete" name="delete">Delete this team</button>
+ </div>
+ </div>
+ </form>
+ </div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/org/members.tmpl b/templates/org/members.tmpl
new file mode 100644
index 0000000000..ba14cb4cc9
--- /dev/null
+++ b/templates/org/members.tmpl
@@ -0,0 +1,56 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body-nav" class="org-nav org-nav-auto">
+ <div class="container clearfix">
+ <div id="org-nav-wrapper">
+ <ul class="nav nav-pills pull-right">
+ <li class="active"><a href="#"><i class="fa fa-users"></i>Members
+ <span class="label label-default">5</span></a>
+ </li>
+ <li><a href="#"><i class="fa fa-tags"></i>Teams
+ <span class="label label-default">2</span></a>
+ </li>
+ </ul>
+ <img class="pull-left org-small-logo" src="https://avatars3.githubusercontent.com/u/6656686?s=140" alt="" width="60"/>
+ <div id="org-nav-info">
+ <h2 class="org-name">Organization Name</h2>
+ </div>
+ </div>
+
+ </div>
+</div>
+<div id="body" class="container">
+ <div id="org">
+ <div id="org-members">
+ <div class="member">&nbsp;
+ <div class="avatar col-md-1">
+ <img src="https://avatars3.githubusercontent.com/u/2142787?s=140" alt=""/>
+ </div>
+ <div class="name col-md-4">
+ <a href="#"><strong>fuxiaohei</strong><span class="nick">傅小黑</span></a>
+ </div>
+ <div class="role col-md-2 pull-right">
+ <strong>Member</strong>
+ </div>
+ <div class="status col-md-1 pull-right">
+ <strong>Public</strong>
+ </div>
+ </div>
+ <div class="member">&nbsp;
+ <div class="avatar col-md-1">
+ <img src="https://avatars3.githubusercontent.com/u/2142787?s=140" alt=""/>
+ </div>
+ <div class="name col-md-4">
+ <a href="#"><strong>fuxiaohei</strong><span class="nick">傅小黑</span></a>
+ </div>
+ <div class="role col-md-2 pull-right">
+ <strong><i class="fa fa-user"></i>Owner</strong>
+ </div>
+ <div class="status col-md-1 pull-right">
+ <i class="fa fa-lock"></i>Private
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/org/new.tmpl b/templates/org/new.tmpl
new file mode 100644
index 0000000000..bb46db4ac3
--- /dev/null
+++ b/templates/org/new.tmpl
@@ -0,0 +1,32 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div class="container" id="body">
+ <form action="/org/create" method="post" class="form-horizontal card" id="org-create">
+ {{.CsrfTokenHtml}}
+ <h3>Create New Organization</h3>
+ {{template "base/alert" .}}
+ <div class="form-group {{if .Err_OrgName}}has-error has-feedback{{end}}">
+ <label class="col-md-2 control-label">Organization<strong class="text-danger">*</strong></label>
+ <div class="col-md-8">
+ <input name="orgname" type="text" class="form-control" placeholder="Type your organization name" value="{{.orgname}}" required="required">
+ <span class="help-block">Great organization names are short and memorable. </span>
+ </div>
+ </div>
+
+ <div class="form-group {{if .Err_Email}}has-error has-feedback{{end}}">
+ <label class="col-md-2 control-label">Email<strong class="text-danger">*</strong></label>
+ <div class="col-md-8">
+ <input name="email" type="text" class="form-control" placeholder="Type organization's email" value="{{.email}}" required="required">
+ <span class="help-block">Organization's Email receives all notifications and confirmations.</span>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-md-offset-2 col-md-8">
+ <button type="submit" class="btn btn-lg btn-primary">Create An Organization</button>
+ <a href="/" class="text-danger">Cancel</a>
+ </div>
+ </div>
+ </form>
+</div>
+{{template "base/footer" .}} \ No newline at end of file
diff --git a/templates/org/new_team.tmpl b/templates/org/new_team.tmpl
new file mode 100644
index 0000000000..752f37d2e0
--- /dev/null
+++ b/templates/org/new_team.tmpl
@@ -0,0 +1,74 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body-nav" class="org-nav org-nav-auto">
+ <div class="container clearfix">
+ <div id="org-nav-wrapper">
+ <ul class="nav nav-pills pull-right">
+ <li><a href="#"><i class="fa fa-users"></i>Members
+ <span class="label label-default">5</span></a>
+ </li>
+ <li class="active"><a href="#"><i class="fa fa-tags"></i>Teams
+ <span class="label label-default">2</span></a>
+ </li>
+ </ul>
+ <img class="pull-left org-small-logo" src="https://avatars3.githubusercontent.com/u/6656686?s=140" alt="" width="60"/>
+ <div id="org-nav-info">
+ <h2 class="org-name">Organization Name</h2>
+ </div>
+ </div>
+ </div>
+</div>
+<div id="body" class="container">
+ <div id="org">
+ <form id="org-teams-create" class="form-horizontal card">
+ <h3>Create new team</h3>
+ <div class="form-group">
+ <label class="col-md-2 control-label">Team Name<strong class="text-danger">*</strong></label>
+ <div class="col-md-8">
+ <input name="team" type="text" class="form-control" placeholder="Type your team name" value="" required="required">
+ <span class="help-block">You'll use this name to mention this team in conversations.</span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-2 control-label">Description</label>
+ <div class="col-md-8">
+ <input name="desc" type="text" class="form-control" placeholder="Type your team description (optional)" value="">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-2 control-label">Permission</label>
+ <div class="col-md-8">
+ <div class="radio">
+ <label>
+ <input type="radio" name="permission" value="pull" checked="">
+ <strong>Read & Clone</strong>
+ </label>
+ <p>This team will be able to view and clone its repositories.</p>
+ </div>
+ <div class="radio">
+ <label>
+ <input type="radio" name="permission" value="push">
+ <strong>Push, Read & Clone</strong>
+ </label>
+ <p>This team will be able to read its repositories, as well as push to them.</p>
+ </div>
+ <div class="radio">
+ <label>
+ <input type="radio" name="permission" value="admin">
+ <strong>Collaboration, Push, Read & Clone</strong>
+ </label>
+ <p>This team will be able to push/pull to its repositories, as well as add other collaborators to them.</p>
+ </div>
+ </div>
+ </div>
+ <hr/>
+ <div class="form-group">
+ <label class="col-md-2">&nbsp;</label>
+ <div class="col-md-8">
+ <button class="btn btn-primary">Create team</button>
+ </div>
+ </div>
+ </form>
+ </div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/org/settings.tmpl b/templates/org/settings.tmpl
new file mode 100644
index 0000000000..fd0d6a1c14
--- /dev/null
+++ b/templates/org/settings.tmpl
@@ -0,0 +1,130 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body-nav">
+ <div class="container">
+ <div class="btn-group pull-left" id="dashboard-switch">
+ <button type="button" class="btn btn-default">
+ <img src="{{.Org.AvatarLink}}?s=28" alt="user-avatar" title="username">
+ {{.Org.Name}}
+ </button>
+ </div>
+ <ul class="nav nav-pills pull-right">
+ <li><a href="/org/{{.Org.Name}}/dashboard/">News Feed</a></li>
+ <li><a href="/org/{{.Org.Name}}/dashboard/issues">Issues</a></li>
+ <li class="active"><a href="/org/{{.Org.Name}}/settings">Settings</a></li>
+ <!-- <li><a href="/pulls">Pull Requests</a></li>
+ <li><a href="/stars">Stars</a></li> -->
+ </ul>
+ </div>
+</div>
+
+<div id="body" class="container" data-page="org">
+ <div id="user-setting-nav" class="col-md-2 repo-setting-nav">
+ <ul class="list-group">
+ <li class="list-group-item active"><a href="#">Options</a></li>
+ </ul>
+ </div>
+ <div id="repo-setting-container" class="col-md-10">
+ {{template "base/alert" .}}
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ Organization Options
+ </div>
+
+ <div class="panel-body">
+ <form action="/org/{{.Org.Name}}/settings" method="post" class="form-horizontal">
+ {{.CsrfTokenHtml}}
+ <input type="hidden" name="action" value="update">
+
+ <div class="form-group{{if .Err_DisplayName}} has-error has-feedback{{end}}">
+ <label class="col-md-3 text-right" for="org-setting-name">Display Name</label>
+ <div class="col-md-9">
+ <input class="form-control" name="display_name" value="{{.Org.FullName}}" title="" id="org-setting-name"/>
+ </div>
+ </div>
+
+ <div class="form-group{{if .Err_Email}} has-error has-feedback{{end}}">
+ <label class="col-md-3 text-right" for="org-email">Email</label>
+ <div class="col-md-9">
+ <input class="form-control" name="email" value="{{.Org.Email}}" title="" id="org-email" type="email"/>
+ </div>
+ </div>
+
+ <div class="form-group{{if .Err_Description}} has-error has-feedback{{end}}">
+ <label class="col-md-3 text-right" for="org-desc">Description</label>
+ <div class="col-md-9">
+ <textarea class="form-control" name="desc" id="org-desc" rows="3">{{.Org.Description}}</textarea>
+ </div>
+ </div>
+
+ <div class="form-group{{if .Err_Website}} has-error has-feedback{{end}}">
+ <label class="col-md-3 text-right" for="org-site">Official Site</label>
+ <div class="col-md-9">
+ <input type="url" class="form-control" name="site" value="{{.Org.Website}}" id="org-site"/>
+ </div>
+ </div>
+
+ <div class="form-group{{if .Err_Location}} has-error has-feedback{{end}}">
+ <label class="col-md-3 text-right" for="org-location">Location</label>
+ <div class="col-md-9">
+ <input class="form-control" name="location" value="{{.Org.Location}}" title="" id="org-location"/>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-md-9 col-md-offset-3">
+ <button class="btn btn-primary" type="submit">Save Options</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+
+ <div class="panel panel-warning">
+ <div class="panel-heading">
+ Danger Zone
+ </div>
+ <div class="panel-body">
+ <button type="button" class="btn btn-default pull-right" href="#delete-org-modal" data-toggle="modal">
+ Delete this organization
+ </button>
+ <dd>
+ <dt>Delete this organization</dt>
+ <dl>Once you delete this organization and all repositories in, there is no going back. Please be
+ certain.
+ </dl>
+ </dd>
+
+ <div class="modal fade" id="delete-org-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+ aria-hidden="true">
+ <div class="modal-dialog">
+ <form action="/org/{{.Org.Name}}/settings/delete" method="post"
+ class="modal-content">
+ {{.CsrfTokenHtml}}
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal"
+ aria-hidden="true">&times;</button>
+ <h4 class="modal-title" id="myModalLabel">Delete organization</h4>
+ </div>
+
+ <div class="modal-body">
+ <div class="form-group">
+ <label>Make sure your are owner of this organization. Please enter your password.<strong class="text-danger">*</strong></label>
+ <input name="password" class="form-control" type="password" placeholder="Type your account password" required="required">
+ </div>
+ </div>
+
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+ <button class="btn btn-danger btn-lg">I understand the consequences, delete this
+ organization
+ </button>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/org/teams.tmpl b/templates/org/teams.tmpl
new file mode 100644
index 0000000000..90aab94401
--- /dev/null
+++ b/templates/org/teams.tmpl
@@ -0,0 +1,71 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body-nav" class="org-nav org-nav-auto">
+ <div class="container clearfix">
+ <div id="org-nav-wrapper">
+ <ul class="nav nav-pills pull-right">
+ <li><a href="#"><i class="fa fa-users"></i>Members
+ <span class="label label-default">5</span></a>
+ </li>
+ <li class="active"><a href="#"><i class="fa fa-tags"></i>Teams
+ <span class="label label-default">2</span></a>
+ </li>
+ </ul>
+ <img class="pull-left org-small-logo" src="https://avatars3.githubusercontent.com/u/6656686?s=140" alt="" width="60"/>
+ <div id="org-nav-info">
+ <h2 class="org-name">Organization Name</h2>
+ </div>
+ </div>
+ </div>
+</div>
+<div id="body" class="container">
+ <div id="org">
+ <div id="org-teams">
+ <div id="org-teams-action">
+ <div class="col-md-12">
+ <a href="#"><button class="btn btn-success"><i class="fa fa-plus-square"></i>New Team</button></a>
+ <hr/>
+ </div>
+ </div>
+ <div class="org-team col-md-6">
+ <div class="panel panel-default">
+ <h2 class="panel-heading org-team-name"><a href="#"><strong>Team Name</strong></a></h2>
+ <div class="panel-body">
+ <p class="org-team-meta">4 members · 10 repositories</p>
+ <p class="org-team-members">
+ <a href="#">
+ <img class="img-thumbnail" src="https://avatars2.githubusercontent.com/u/2946214?s=60" alt=""/>
+ </a>
+ <a href="#">
+ <img class="img-thumbnail" src="https://avatars2.githubusercontent.com/u/2946214?s=60" alt=""/>
+ </a>
+ </p>
+ </div>
+ <div class="panel-footer">
+ <button class="pull-right btn btn-default">Join</button>
+ </div>
+ </div>
+ </div>
+ <div class="org-team col-md-6">
+ <div class="panel panel-default">
+ <h2 class="panel-heading org-team-name"><a href="#"><strong>Team Name</strong></a></h2>
+ <div class="panel-body">
+ <p class="org-team-meta">4 members · 10 repositories</p>
+ <p class="org-team-members">
+ <a href="#">
+ <img class="img-thumbnail" src="https://avatars2.githubusercontent.com/u/2946214?s=60" alt=""/>
+ </a>
+ <a href="#">
+ <img class="img-thumbnail" src="https://avatars2.githubusercontent.com/u/2946214?s=60" alt=""/>
+ </a>
+ </p>
+ </div>
+ <div class="panel-footer">
+ <button class="pull-right btn btn-danger">Leave</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/repo/branches.tmpl b/templates/repo/branch.tmpl
index 8d2d59d7fd..8d2d59d7fd 100644
--- a/templates/repo/branches.tmpl
+++ b/templates/repo/branch.tmpl
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index 6da6a93d15..38b32a3bfc 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -8,9 +8,37 @@
<div class="form-group">
<label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label>
<div class="col-md-8">
- <p class="form-control-static">{{.SignedUserName}}</p>
- <input type="hidden" value="{{.SignedUserId}}" name="userId"/>
+ <div class="btn-group" id="repo-owner-switch">
+ <button type="button" class="btn btn-default" id="repo-owner-current">
+ <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username" id="repo-owner-avatar">
+ <span id="repo-owner-name">{{.SignedUser.Name}}</span>
+ </button>
+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+ <span class="caret"></span>
+ </button>
+ <div class="dropdown-menu clone-group-btn no-propagation">
+ <ul id="dashboard-switch-menu" class="list-unstyled">
+ <li data-uid="{{.SignedUser.Id}}" class="checked">
+ <a>
+ <i class="fa fa-check"></i>
+ <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username">
+ {{.SignedUser.Name}}
+ </a>
+ </li>
+ {{range .Orgs}}
+ <li data-uid="{{.Id}}">
+ <a>
+ <i class="fa fa-check"></i>
+ <img src="{{.AvatarLink}}?s=28" alt="user-avatar" title="username">
+ {{.Name}}
+ </a>
+ </li>
+ {{end}}
+ </ul>
+ </div>
+ </div>
</div>
+ <input type="hidden" value="{{.SignedUserId}}" name="uid" id="repo-owner-id"/>
</div>
<div class="form-group {{if .Err_RepoName}}has-error has-feedback{{end}}">
diff --git a/templates/repo/hooks_add.tmpl b/templates/repo/hook_add.tmpl
index df3ff3bdf4..df3ff3bdf4 100644
--- a/templates/repo/hooks_add.tmpl
+++ b/templates/repo/hook_add.tmpl
diff --git a/templates/repo/hooks_edit.tmpl b/templates/repo/hook_edit.tmpl
index c3fe217e37..c3fe217e37 100644
--- a/templates/repo/hooks_edit.tmpl
+++ b/templates/repo/hook_edit.tmpl
diff --git a/templates/issue/create.tmpl b/templates/repo/issue/create.tmpl
index 34cecc78bd..34cecc78bd 100644
--- a/templates/issue/create.tmpl
+++ b/templates/repo/issue/create.tmpl
diff --git a/templates/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 0fae3eb663..0fae3eb663 100644
--- a/templates/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
diff --git a/templates/issue/milestone.tmpl b/templates/repo/issue/milestone.tmpl
index 8a5751c19b..8a5751c19b 100644
--- a/templates/issue/milestone.tmpl
+++ b/templates/repo/issue/milestone.tmpl
diff --git a/templates/issue/milestone_edit.tmpl b/templates/repo/issue/milestone_edit.tmpl
index 8f1a05e012..8f1a05e012 100644
--- a/templates/issue/milestone_edit.tmpl
+++ b/templates/repo/issue/milestone_edit.tmpl
diff --git a/templates/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl
index 044b7d1061..044b7d1061 100644
--- a/templates/issue/milestone_new.tmpl
+++ b/templates/repo/issue/milestone_new.tmpl
diff --git a/templates/issue/view.tmpl b/templates/repo/issue/view.tmpl
index ba1fe16b79..ba1fe16b79 100644
--- a/templates/issue/view.tmpl
+++ b/templates/repo/issue/view.tmpl
diff --git a/templates/repo/migrate.tmpl b/templates/repo/migrate.tmpl
index 34a4077eec..fff25e6de5 100644
--- a/templates/repo/migrate.tmpl
+++ b/templates/repo/migrate.tmpl
@@ -44,9 +44,37 @@
<div class="form-group">
<label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label>
<div class="col-md-8">
- <p class="form-control-static">{{.SignedUserName}}</p>
- <input type="hidden" value="{{.SignedUserId}}" name="userId"/>
+ <div class="btn-group" id="repo-owner-switch">
+ <button type="button" class="btn btn-default" id="repo-owner-current">
+ <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username" id="repo-owner-avatar">
+ <span id="repo-owner-name">{{.SignedUser.Name}}</span>
+ </button>
+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+ <span class="caret"></span>
+ </button>
+ <div class="dropdown-menu clone-group-btn no-propagation">
+ <ul id="dashboard-switch-menu" class="list-unstyled">
+ <li data-uid="{{.SignedUser.Id}}" class="checked">
+ <a>
+ <i class="fa fa-check"></i>
+ <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username">
+ {{.SignedUser.Name}}
+ </a>
+ </li>
+ {{range .Orgs}}
+ <li data-uid="{{.Id}}">
+ <a>
+ <i class="fa fa-check"></i>
+ <img src="{{.AvatarLink}}?s=28" alt="user-avatar" title="username">
+ {{.Name}}
+ </a>
+ </li>
+ {{end}}
+ </ul>
+ </div>
+ </div>
</div>
+ <input type="hidden" value="{{.SignedUserId}}" name="uid" id="repo-owner-id"/>
</div>
<div class="form-group {{if .Err_RepoName}}has-error has-feedback{{end}}">
diff --git a/templates/release/edit.tmpl b/templates/repo/release/edit.tmpl
index e437092c8c..e437092c8c 100644
--- a/templates/release/edit.tmpl
+++ b/templates/repo/release/edit.tmpl
diff --git a/templates/release/list.tmpl b/templates/repo/release/list.tmpl
index 0f02508fb9..0f02508fb9 100644
--- a/templates/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
diff --git a/templates/release/new.tmpl b/templates/repo/release/new.tmpl
index 6c5cf40ceb..6c5cf40ceb 100644
--- a/templates/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl
index c44ba36278..e1b43e1597 100644
--- a/templates/user/dashboard.tmpl
+++ b/templates/user/dashboard.tmpl
@@ -4,27 +4,46 @@
<div class="container">
<div class="btn-group pull-left" id="dashboard-switch">
<button type="button" class="btn btn-default">
- <img src="//1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132?s=28" alt="user-avatar" title="username">
- fuxiaohei
+ <img src="{{.ContextUser.AvatarLink}}?s=28" alt="user-avatar" title="username">
+ {{.ContextUser.Name}}
</button>
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<div class="dropdown-menu clone-group-btn no-propagation">
<ul id="dashboard-switch-menu" class="list-unstyled">
- <li class="checked"><a href="#"><i class="fa fa-check"></i> gogits/gogs</a></li>
+ <li{{if not .PageIsOrgDashboard}} class="checked"{{end}}>
+ <a href="/">
+ <i class="fa fa-check"></i>
+ <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username">
+ {{.SignedUser.Name}}
+ </a>
+ </li>
+ {{range .Orgs}}
+ <li{{if eq $.ContextUser.Id .Id}} class="checked"{{end}}>
+ <a href="/org/{{.Name}}/dashboard">
+ <i class="fa fa-check"></i>
+ <img src="{{.AvatarLink}}?s=28" alt="user-avatar" title="username">
+ {{.Name}}
+ </a>
+ </li>
+ {{end}}
+ <li>
+ <a href="/org/create">Create organization</a>
+ </li>
</ul>
</div>
</div>
<ul class="nav nav-pills pull-right">
- <li class="active"><a href="/">Feed</a></li>
- <li><a href="/issues">Issues</a></li>
+ <li class="active"><a href="/{{if .PageIsOrgDashboard}}org/{{.ContextUser.Name}}/dashboard{{end}}">News Feed</a></li>
+ <li><a href="/{{if .PageIsOrgDashboard}}org/{{.ContextUser.Name}}/dashboard/{{end}}issues">Issues</a></li>
+ {{if .PageIsOrgDashboard}}<li><a href="/org/{{.ContextUser.Name}}/settings">Settings</a></li>{{end}}
<!-- <li><a href="/pulls">Pull Requests</a></li>
<li><a href="/stars">Stars</a></li> -->
</ul>
- <h3>News Feed</h3>
</div>
</div>
+
<div id="body" class="container" data-page="user">
{{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
<div id="feed-left" class="col-md-8">
@@ -42,7 +61,7 @@
</div>
<div id="feed-right" class="col-md-4">
<div class="panel panel-default repo-panel">
- <div class="panel-heading">Your Repositories
+ <div class="panel-heading">{{if not .PageIsOrgDashboard}}Your {{end}}Repositories
<div class="btn-group pull-right" id="user-dashboard-repo-new">
<button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-square"></i>New</button>
<div class="dropdown-menu dropdown-menu-right">
@@ -64,7 +83,8 @@
</ul>
</div>
</div>
-
+
+ {{if not .PageIsOrgDashboard}}
<div class="panel panel-default repo-panel">
<div class="panel-heading">Collaborative Repositories</div>
<div class="panel-body">
@@ -76,6 +96,7 @@
</ul>
</div>
</div>
+ {{end}}
</div>
</div>
{{template "base/footer" .}}
diff --git a/templates/user/issue.tmpl b/templates/user/issues.tmpl
index d1c2bd9941..c4ad64a4cf 100644
--- a/templates/user/issue.tmpl
+++ b/templates/user/issues.tmpl
@@ -3,7 +3,7 @@
<div id="body-nav">
<div class="container">
<ul class="nav nav-pills pull-right">
- <li><a href="/">Feed</a></li>
+ <li><a href="/">News 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> -->
@@ -11,6 +11,7 @@
<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">
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 08:25:48 +0000