| ... | ... |
@@ -60,6 +60,7 @@ sub logined {
|
| 60 | 60 |
|
| 61 | 61 |
my $id = $c->session('user_id');
|
| 62 | 62 |
my $password = $c->session('user_password');
|
| 63 |
+ return unless defined $password; |
|
| 63 | 64 |
|
| 64 | 65 |
my $row = $dbi->model('user')->select('config', id => $id)->one;
|
| 65 | 66 |
return unless $row; |
| ... | ... |
@@ -3,31 +3,27 @@ |
| 3 | 3 |
%> |
| 4 | 4 |
|
| 5 | 5 |
<div class="container"> |
| 6 |
- % if ($api->logined) {
|
|
| 7 |
- <div> |
|
| 8 |
- <ul> |
|
| 9 |
- <li><a href="<%= url_for('/') %>">GitPrep</a></li>
|
|
| 10 |
- </ul> |
|
| 11 |
- <ul> |
|
| 12 |
- <li><a href="<%= url_for("/_login?op=logout") %>">Sign out</a></li>
|
|
| 13 |
- <li> |
|
| 14 |
- <a href="<%= url_for("/setting/profile") %>"><s>Account setting</s></a>
|
|
| 15 |
- </li> |
|
| 16 |
- <li><a href="<%= url_for("/_admin/create") %>">Create a new repo</a></li>
|
|
| 17 |
- % if (my $user = session('user_id')) {
|
|
| 18 |
- <li><a href="<%= url_for("/$user") %>"><%= $user %></a></li>
|
|
| 19 |
- % } |
|
| 20 |
- </ul> |
|
| 6 |
+ <div class="row"> |
|
| 7 |
+ <div class="span4"> |
|
| 8 |
+ <h3><a href="<%= url_for('/') %>">GitPrep</a></h3>
|
|
| 21 | 9 |
</div> |
| 22 |
- % } else {
|
|
| 23 |
- <div class="row"> |
|
| 24 |
- <div class="span4"> |
|
| 25 |
- <h3 class="muted"><a href="<%= url_for('/') %>">GitPrep</a></h3>
|
|
| 26 |
- </div> |
|
| 27 |
- <div class="span8 text-right" style="margin-top:15px"> |
|
| 28 |
- <a class="btn btn-primary" href="<%= url_for('/_login') %>">Sing in</a>
|
|
| 29 |
- </div> |
|
| 10 |
+ <div class="span8 text-right"> |
|
| 11 |
+ % if ($api->logined) {
|
|
| 12 |
+ <div style="margin-top:5px"> |
|
| 13 |
+ <div> |
|
| 14 |
+ % my $user = session('user_id');
|
|
| 15 |
+ <i class="icon-user"></i><a href="<%= url_for("/$user") %>"><%= $user %></a>
|
|
| 16 |
+ </div> |
|
| 17 |
+ <a class="btn btn-small" href="<%= url_for("/_admin/create") %>">Create a new repo</a>
|
|
| 18 |
+ <a class="btn btn-small" href="<%= url_for("/setting/profile") %>">Account setting</a>
|
|
| 19 |
+ <a class="btn btn-small" href="<%= url_for("/_login?op=logout") %>">Sign out</a>
|
|
| 20 |
+ </div> |
|
| 21 |
+ % } else {
|
|
| 22 |
+ <div style="margin-top:15px"> |
|
| 23 |
+ <a class="btn btn-primary" href="<%= url_for('/_login') %>">Sing in</a>
|
|
| 24 |
+ </div> |
|
| 25 |
+ % } |
|
| 30 | 26 |
</div> |
| 31 |
- % } |
|
| 27 |
+ </div> |
|
| 32 | 28 |
</div> |
| 33 | 29 |
<hr style="margin-top:0;margin-bottom:10px"> |
| ... | ... |
@@ -2,6 +2,8 @@ |
| 2 | 2 |
|
| 3 | 3 |
<h2>Admin</h2> |
| 4 | 4 |
|
| 5 |
-<ul> |
|
| 6 |
- <li><a href="/_admin/user">User</a></li> |
|
| 7 |
-</ul> |
|
| 5 |
+<table class="table"> |
|
| 6 |
+ <tr> |
|
| 7 |
+ <td><a href="/_admin/user">User</a></td> |
|
| 8 |
+ </tr> |
|
| 9 |
+</table> |
| ... | ... |
@@ -67,9 +67,11 @@ |
| 67 | 67 |
|
| 68 | 68 |
if ($admin) {
|
| 69 | 69 |
$self->redirect_to('/_admin');
|
| 70 |
+ return 1; |
|
| 70 | 71 |
} |
| 71 | 72 |
else {
|
| 72 | 73 |
$self->redirect_to("/$id");
|
| 74 |
+ return 1; |
|
| 73 | 75 |
} |
| 74 | 76 |
} |
| 75 | 77 |
else {
|
| ... | ... |
@@ -78,111 +80,39 @@ |
| 78 | 80 |
} elsif ($op eq 'logout') {
|
| 79 | 81 |
session(expires => 1); |
| 80 | 82 |
$self->redirect_to('/');
|
| 83 |
+ return 1; |
|
| 81 | 84 |
} |
| 82 | 85 |
%> |
| 83 | 86 |
|
| 84 |
- |
|
| 85 |
-%= stylesheet begin |
|
| 86 |
- .signin {
|
|
| 87 |
- width:350px; |
|
| 88 |
- margin-left:auto; |
|
| 89 |
- margin-right:auto; |
|
| 90 |
- } |
|
| 91 |
- .signin .sheader {
|
|
| 92 |
- margin-top:50px; |
|
| 93 |
- background-color:#6c8393; |
|
| 94 |
- padding:15px; |
|
| 95 |
- border:1px solid #586873; |
|
| 96 |
- border-bottom:1px solid #6c8393; |
|
| 97 |
- border-top-left-radius:5px; |
|
| 98 |
- border-top-right-radius:5px; |
|
| 99 |
- color:white; |
|
| 100 |
- font-weight:bold; |
|
| 101 |
- } |
|
| 102 |
- .signin .serror {
|
|
| 103 |
- color:red; |
|
| 104 |
- margin-bottom:10px; |
|
| 105 |
- } |
|
| 106 |
- .signin .sbody {
|
|
| 107 |
- margin-left:auto; |
|
| 108 |
- margin-right:auto; |
|
| 109 |
- margin-bottom:10px; |
|
| 110 |
- border:1px solid #d8dee2; |
|
| 111 |
- border-top:none; |
|
| 112 |
- border-bottom-left-radius:5px; |
|
| 113 |
- border-bottom-right-radius:5px; |
|
| 114 |
- padding:20px 20px; |
|
| 115 |
- } |
|
| 116 |
- .signin .suser_header {
|
|
| 117 |
- font-weight:bold; |
|
| 118 |
- margin-bottom:5px; |
|
| 119 |
- } |
|
| 120 |
- .signin .suser {
|
|
| 121 |
- background-color:white; |
|
| 122 |
- border:1px solid #d8dee2; |
|
| 123 |
- width:100%; |
|
| 124 |
- height:25px; |
|
| 125 |
- border-radius:3px; |
|
| 126 |
- margin-bottom:10px; |
|
| 127 |
- display:block; |
|
| 128 |
- } |
|
| 129 |
- .signin .spassword_header {
|
|
| 130 |
- font-weight:bold; |
|
| 131 |
- padding-bottom:5px; |
|
| 132 |
- } |
|
| 133 |
- .signin .spassword {
|
|
| 134 |
- background-color:white; |
|
| 135 |
- border:1px solid #d8dee2; |
|
| 136 |
- width:100%; |
|
| 137 |
- height:25px; |
|
| 138 |
- border-radius:3px; |
|
| 139 |
- margin-bottom:10px; |
|
| 140 |
- display:block; |
|
| 141 |
- } |
|
| 142 |
- .signin .ssubmit {
|
|
| 143 |
- display:block; |
|
| 144 |
- background-color:#EEE; |
|
| 145 |
- border:1px solid #d8dee2; |
|
| 146 |
- text-align:center; |
|
| 147 |
- height:35px; |
|
| 148 |
- width:60px; |
|
| 149 |
- border-radius:4px; |
|
| 150 |
- cursor:pointer; |
|
| 151 |
- } |
|
| 152 |
- .signin .submit input {
|
|
| 153 |
- width:150px; |
|
| 154 |
- height:40px; |
|
| 155 |
- } |
|
| 156 |
-% end |
|
| 157 |
- |
|
| 158 | 87 |
% layout 'common'; |
| 159 |
-%= include '/css/common'; |
|
| 160 |
-%= include '/include/header'; |
|
| 161 | 88 |
|
| 162 |
-% my $id = ''; |
|
| 163 |
-% if (flash('success')) {
|
|
| 164 |
- <br> |
|
| 165 |
- <b><center>Start up success! Please login as admin user.</center></b> |
|
| 166 |
- % $id = flash('id');
|
|
| 167 |
-% } |
|
| 89 |
+ %= include '/include/header'; |
|
| 168 | 90 |
|
| 169 |
-% if ($state eq 'start' || $state eq 'error') {
|
|
| 170 |
- <div class="signin"> |
|
| 171 |
- <div class="sheader"> |
|
| 172 |
- Sing in |
|
| 173 |
- </div> |
|
| 174 |
- <div class="sbody"> |
|
| 175 |
- % if ($state eq 'error') {
|
|
| 176 |
- <div class="serror"> |
|
| 177 |
- Incorrect username or password. |
|
| 91 |
+ % my $id = ''; |
|
| 92 |
+ % if (flash('success')) {
|
|
| 93 |
+ <br> |
|
| 94 |
+ <b><center>Start up success! Please login as admin user.</center></b> |
|
| 95 |
+ % $id = flash('id');
|
|
| 96 |
+ % } |
|
| 97 |
+ |
|
| 98 |
+ <div class="border-gray" style="padding-top:15px;padding-left:60px;width:300px;margin-left:auto;margin-right:auto"> |
|
| 99 |
+ <form action="<%= url_for->query(op => 'login') %>" method="post"> |
|
| 100 |
+ <div class="control-group"> |
|
| 101 |
+ <label class="control-label" for="user-name">user-name</label> |
|
| 102 |
+ <div class="controls"> |
|
| 103 |
+ <%= input_tag id => $id, type => 'text', placeholder => 'User', id =>'user-name'%> |
|
| 104 |
+ </div> |
|
| 105 |
+ </div> |
|
| 106 |
+ <div class="control-group"> |
|
| 107 |
+ <label class="control-label" for="input-password">Password</label> |
|
| 108 |
+ <div class="controls"> |
|
| 109 |
+ <%= password_field 'password', id => 'input-password', placeholder => 'Password' %> |
|
| 110 |
+ </div> |
|
| 111 |
+ </div> |
|
| 112 |
+ <div class="control-group"> |
|
| 113 |
+ <div class="controls"> |
|
| 114 |
+ <button type="submit" class="btn">Sign in</button> |
|
| 178 | 115 |
</div> |
| 179 |
- % } |
|
| 180 |
- <form action="<%= url_for->query(op => 'login') %>" method="post"> |
|
| 181 |
- <div class="suser_header">Username</div> |
|
| 182 |
- <%= input_tag id => $id, class => 'suser' %> |
|
| 183 |
- <div class="spassword_header">Password</div> |
|
| 184 |
- <%= password_field 'password', class => 'spassword' %> |
|
| 185 |
- <input class="ssubmit" type="submit" value="Sign in"> |
|
| 186 |
- </form> |
|
| 187 |
- </div> |
|
| 188 |
-% } |
|
| 116 |
+ </div> |
|
| 117 |
+ </form> |
|
| 118 |
+ </div> |