| ... | ... |
@@ -1,6 +1,7 @@ |
| 1 | 1 |
<% |
| 2 | 2 |
# API |
| 3 | 3 |
my $api = gitprep_api; |
| 4 |
+ my $session_user = session('user');
|
|
| 4 | 5 |
|
| 5 | 6 |
my $op = param('op') || '';
|
| 6 | 7 |
|
| ... | ... |
@@ -44,7 +45,6 @@ |
| 44 | 45 |
} |
| 45 | 46 |
|
| 46 | 47 |
my $data = $vresult->data; |
| 47 |
- my $user = session('user');
|
|
| 48 | 48 |
my $project = $data->{project};
|
| 49 | 49 |
my $description = $data->{description};
|
| 50 | 50 |
$description = '' unless defined $description; |
| ... | ... |
@@ -52,14 +52,14 @@ |
| 52 | 52 |
my $private = $data->{private};
|
| 53 | 53 |
|
| 54 | 54 |
my $manager = app->manager; |
| 55 |
- if ($manager->exists_project($user, $project)) {
|
|
| 55 |
+ if ($manager->exists_project($session_user, $project)) {
|
|
| 56 | 56 |
$errors = ['Repository already exists']; |
| 57 | 57 |
} |
| 58 | 58 |
else {
|
| 59 | 59 |
# Create repository |
| 60 | 60 |
eval {
|
| 61 | 61 |
$manager->create_project( |
| 62 |
- $user, |
|
| 62 |
+ $session_user, |
|
| 63 | 63 |
$project, |
| 64 | 64 |
{description => $description, readme => $readme, private => $private}
|
| 65 | 65 |
); |
| ... | ... |
@@ -70,7 +70,7 @@ |
| 70 | 70 |
$errors = ['Internal error']; |
| 71 | 71 |
} |
| 72 | 72 |
else {
|
| 73 |
- $self->redirect_to("/$user/$project");
|
|
| 73 |
+ $self->redirect_to("/$session_user/$project");
|
|
| 74 | 74 |
return; |
| 75 | 75 |
} |
| 76 | 76 |
} |
| ... | ... |
@@ -81,7 +81,7 @@ |
| 81 | 81 |
|
| 82 | 82 |
% layout 'common', title => 'Create a New Repository'; |
| 83 | 83 |
|
| 84 |
- %= include '/include/header'; |
|
| 84 |
+ %= include '/include/header', no_project_header => 1; |
|
| 85 | 85 |
|
| 86 | 86 |
<div class="container"> |
| 87 | 87 |
% if ($errors) {
|
| ... | ... |
@@ -92,16 +92,49 @@ |
| 92 | 92 |
% } |
| 93 | 93 |
</div> |
| 94 | 94 |
% } |
| 95 |
+ <div style="border-bottom:1px solid #e5e5e5;margin-top:40px;margin-bottom:20px;"> |
|
| 96 |
+ <div style="font-weight:bold;font-size:18px;color:#333;margin-bottom:3px;"> |
|
| 97 |
+ Create a new repository |
|
| 98 |
+ </div> |
|
| 99 |
+ <div style="color:#666;margin-bottom:5px;"> |
|
| 100 |
+ A repository contains all the files for your project, including the revision history. |
|
| 101 |
+ </div> |
|
| 102 |
+ </div> |
|
| 95 | 103 |
<form action="<%= url_for->query(op => 'create') %>" method="post"> |
| 96 |
- <div><b>Repository name</b></div> |
|
| 97 |
- <div><%= input_tag 'project', type => 'text', style => 'width:300px' %></div> |
|
| 104 |
+ <table> |
|
| 105 |
+ <tr> |
|
| 106 |
+ <td> |
|
| 107 |
+ <b>Owner</b> |
|
| 108 |
+ </td> |
|
| 109 |
+ <td> |
|
| 110 |
+ |
|
| 111 |
+ </td> |
|
| 112 |
+ <td> |
|
| 113 |
+ <b>Repository name</b> |
|
| 114 |
+ </td> |
|
| 115 |
+ </tr> |
|
| 116 |
+ <tr> |
|
| 117 |
+ <td> |
|
| 118 |
+ <i class="icon-user"></i><%= $session_user %> |
|
| 119 |
+ </td> |
|
| 120 |
+ <td style="padding:0 10px"> |
|
| 121 |
+ / |
|
| 122 |
+ </td> |
|
| 123 |
+ <td> |
|
| 124 |
+ <%= input_tag 'project', type => 'text', style => 'width:300px' %> |
|
| 125 |
+ </td> |
|
| 126 |
+ </tr> |
|
| 127 |
+ </table> |
|
| 128 |
+ <div style="margin-bottom:20px"> |
|
| 129 |
+ Great repository names are short and memorable. |
|
| 130 |
+ </div> |
|
| 98 | 131 |
|
| 99 | 132 |
<div><b>Description</b> (optional)</div> |
| 100 | 133 |
<div><%= input_tag 'description', type => 'text', style => 'width:600px' %></div> |
| 101 | 134 |
|
| 102 | 135 |
<div> |
| 103 | 136 |
<label class="checkbox" style="margin-bottom:0"> |
| 104 |
- <%= check_box readme => 1 %><b>Initialize this repository with a README</b> |
|
| 137 |
+ <%= check_box readme => 1 %><b>Initialize this $session_usertory with a README</b> |
|
| 105 | 138 |
</label> |
| 106 | 139 |
</div> |
| 107 | 140 |
<div class="muted" style="margin-left:20px">This will allow you to git clone the repository immediately.</div> |
| ... | ... |
@@ -3,14 +3,16 @@ |
| 3 | 3 |
my $logined = $api->logined; |
| 4 | 4 |
|
| 5 | 5 |
my $current_user = session('user');
|
| 6 |
- my $user = param('user');
|
|
| 6 |
+ my $user = $self->param('user');
|
|
| 7 | 7 |
|
| 8 | 8 |
my $project = param('project');
|
| 9 | 9 |
my $original_user; |
| 10 | 10 |
my $original_project; |
| 11 | 11 |
my $is_private_project; |
| 12 | 12 |
|
| 13 |
- if (defined $project) {
|
|
| 13 |
+ my $no_project_header = stash('no_project_header');
|
|
| 14 |
+ |
|
| 15 |
+ if (!$no_project_header && defined $project) {
|
|
| 14 | 16 |
$original_user = app->manager->original_user($user, $project); |
| 15 | 17 |
$original_project = app->manager->original_project($user, $project); |
| 16 | 18 |
$is_private_project = app->manager->is_private_project($user, $project); |
| ... | ... |
@@ -51,7 +53,7 @@ |
| 51 | 53 |
</div> |
| 52 | 54 |
<hr style="margin:0;"> |
| 53 | 55 |
|
| 54 |
-% if (defined $user || defined $project) {
|
|
| 56 |
+% if (!$no_project_header && (defined $user || defined $project)) {
|
|
| 55 | 57 |
<div style="padding-top:10px;background:#fafafa;border-bottom:1px solid #eee;margin-bottom:10px;"> |
| 56 | 58 |
<div class="container"> |
| 57 | 59 |
<div class="row" style="margin-bottom:10px"> |