mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 18:28:37 +00:00
Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts: routers/repo/repo.go
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
{{template "base/navbar" .}}
|
||||
<div id="body" class="container" data-page="admin">
|
||||
{{template "admin/nav" .}}
|
||||
<div id="admin-container" class="col-md-9">
|
||||
<div id="admin-container" class="col-md-10">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
Server Configuration
|
||||
|
@@ -2,7 +2,7 @@
|
||||
{{template "base/navbar" .}}
|
||||
<div id="body" class="container" data-page="admin">
|
||||
{{template "admin/nav" .}}
|
||||
<div id="admin-container" class="col-md-9">
|
||||
<div id="admin-container" class="col-md-10">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
Statistic
|
||||
|
@@ -1,4 +1,4 @@
|
||||
<div id="user-setting-nav" class="col-md-3 admin-nav">
|
||||
<div id="user-setting-nav" class="col-md-2 admin-nav">
|
||||
<ul class="list-group">
|
||||
<li class="list-group-item{{if .PageIsDashboard}} active{{end}}"><a href="/admin"><i class="fa fa-tachometer fa-lg"></i> Dashboard</a></li>
|
||||
<li class="list-group-item{{if .PageIsUsers}} active{{end}}"><a href="/admin/users"><i class="fa fa-users fa-lg"></i> Users</a></li>
|
||||
|
@@ -2,7 +2,7 @@
|
||||
{{template "base/navbar" .}}
|
||||
<div id="body" class="container" data-page="admin">
|
||||
{{template "admin/nav" .}}
|
||||
<div id="admin-container" class="col-md-9">
|
||||
<div id="admin-container" class="col-md-10">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
Repository Management
|
||||
|
@@ -2,7 +2,7 @@
|
||||
{{template "base/navbar" .}}
|
||||
<div id="body" class="container" data-page="admin">
|
||||
{{template "admin/nav" .}}
|
||||
<div id="admin-container" class="col-md-9">
|
||||
<div id="admin-container" class="col-md-10">
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
User Management
|
||||
|
@@ -25,7 +25,7 @@
|
||||
<div class="form-group">
|
||||
<label class="col-md-3 text-right">Name</label>
|
||||
<div class="col-md-9">
|
||||
<input class="form-control" name="name" value="{{.Repository.Name}}" />
|
||||
<input class="form-control" name="name" value="{{.Repository.Name}}" title="{{.Repository.Name}}" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -64,12 +64,62 @@
|
||||
Danger Zone
|
||||
</div>
|
||||
|
||||
<div class="panel-body">
|
||||
<button type="button" class="btn btn-default pull-right" href="#transfer-repository-modal" data-toggle="modal">
|
||||
Transfer ownership
|
||||
</button>
|
||||
<dd>
|
||||
<dt>Transfer ownership</dt>
|
||||
<dl>Transfer this repo to another user or to an organization where you have admin rights.</dl>
|
||||
</dd>
|
||||
|
||||
<div class="modal fade" id="transfer-repository-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog">
|
||||
<form action="/{{.Owner.Name}}/{{.Repository.Name}}/settings" method="post" class="modal-content">
|
||||
{{.CsrfTokenHtml}}
|
||||
<input type="hidden" name="action" value="transfer">
|
||||
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
<h4 class="modal-title" id="myModalLabel">Do you really want to transfer this repo?</h4>
|
||||
</div>
|
||||
|
||||
<div class="modal-body">
|
||||
<div class="alert alert-warning">This is important, pay attention.</div>
|
||||
<ul>
|
||||
<!-- <li>Transferring may be delayed until the new owner approves the transfer.</li> -->
|
||||
<!-- <li>If you are transferring into an org, teams <strong>will not be set</strong>. An owner on the org will need to set teams for the repo.</li> -->
|
||||
<li>Admin rights will be transferred to the new owner, you <strong>will lose admin rights</strong>.</li>
|
||||
<!-- <li>Admin rights will be transferred to the new owner, you <strong>may lose admin rights</strong> if you are transferring into an organization account.</li> -->
|
||||
<li>Redirect entries <strong>will NOT be</strong> set up from the previous location.</li>
|
||||
<li>Git access <strong>will NOT continue</strong> to work from the previous location.</li>
|
||||
</ul>
|
||||
<div class="form-group">
|
||||
<label>Please type the name of the repository to confirm "<strong class="text-danger">{{.Repository.Name}}</strong>"</label>
|
||||
<input name="repository" class="form-control" type="text" placeholder="Type your repository name" required="required">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Please type the name of the new owner:</label>
|
||||
<input name="owner" class="form-control" type="text" placeholder="Type new owner's name" 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, transfer this repository</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<hr>
|
||||
<div class="panel-body">
|
||||
<button type="button" class="btn btn-default pull-right" href="#delete-repository-modal" data-toggle="modal">
|
||||
Delete this repository
|
||||
</button>
|
||||
<dd>
|
||||
<dt>Delete this repository.</dt>
|
||||
<dt>Delete this repository</dt>
|
||||
<dl>Once you delete a repository, there is no going back. Please be certain.</dl>
|
||||
</dd>
|
||||
|
||||
|
@@ -12,7 +12,7 @@
|
||||
<div class="form-group">
|
||||
<label class="col-md-2 control-label">Username<strong class="text-danger">*</strong></label>
|
||||
<div class="col-md-8">
|
||||
<input name="username" class="form-control" placeholder="Type your user name" required="required" value="{{.SignedUser.Name}}">
|
||||
<input name="username" class="form-control" placeholder="Type your user name" required="required" value="{{.SignedUser.Name}}" title="{{.SignedUser.Name}}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
Reference in New Issue
Block a user