| ... | ... |
@@ -347,19 +347,29 @@ sub startup {
|
| 347 | 347 |
$r->get('/compare/(*rev1)...(*rev2)' => template '/compare');
|
| 348 | 348 |
|
| 349 | 349 |
# Settings |
| 350 |
- $r->any('/settings' => template '/settings');
|
|
| 351 |
- |
|
| 352 |
- # Collaboration |
|
| 353 |
- $r->any('/settings/collaboration' => template '/settings/collaboration');
|
|
| 350 |
+ {
|
|
| 351 |
+ my $r = $r->route('/settings')->to(tab => 'settings');
|
|
| 352 |
+ |
|
| 353 |
+ # Settings |
|
| 354 |
+ $r->any('/' => template '/settings');
|
|
| 355 |
+ |
|
| 356 |
+ # Collaboration |
|
| 357 |
+ $r->any('/collaboration' => template '/settings/collaboration');
|
|
| 358 |
+ } |
|
| 354 | 359 |
|
| 355 | 360 |
# Fork |
| 356 | 361 |
$r->any('/fork' => template '/fork');
|
| 357 |
- |
|
| 362 |
+ |
|
| 358 | 363 |
# Network |
| 359 |
- $r->get('/network' => template '/network');
|
|
| 364 |
+ {
|
|
| 365 |
+ my $r = $r->route('/network')->to(tab => 'graph');
|
|
| 366 |
+ |
|
| 367 |
+ # Network |
|
| 368 |
+ $r->get('/' => template '/network');
|
|
| 360 | 369 |
|
| 361 |
- # Network Graph |
|
| 362 |
- $r->get('/network/graph/(*rev1)...(*rev2_abs)' => template '/network/graph');
|
|
| 370 |
+ # Network Graph |
|
| 371 |
+ $r->get('/graph/(*rev1)...(*rev2_abs)' => template '/network/graph');
|
|
| 372 |
+ } |
|
| 363 | 373 |
|
| 364 | 374 |
# Import branch |
| 365 | 375 |
$r->any('/import-branch/:remote_user/:remote_project' => template '/import-branch');
|
| ... | ... |
@@ -72,13 +72,13 @@ input[type=text], input[type=password] {
|
| 72 | 72 |
display:block; |
| 73 | 73 |
width:100%; |
| 74 | 74 |
text-decoration:none; |
| 75 |
- padding:8px 10px 7px 10px; |
|
| 75 |
+ padding:8px 0px 7px 0px; |
|
| 76 | 76 |
text-align:center; |
| 77 | 77 |
color:#565656; |
| 78 | 78 |
} |
| 79 | 79 |
|
| 80 | 80 |
.project-tabs li.active a {
|
| 81 |
- padding:5px 10px 7px 10px; |
|
| 81 |
+ padding:5px 0px 7px 0px; |
|
| 82 | 82 |
} |
| 83 | 83 |
|
| 84 | 84 |
.admin-users {
|
| ... | ... |
@@ -1584,11 +1584,12 @@ button.close {
|
| 1584 | 1584 |
|
| 1585 | 1585 |
/* bread */ |
| 1586 | 1586 |
.breadcrumb {
|
| 1587 |
- margin: 0 0 20px; |
|
| 1587 |
+ margin-bottom:10px; |
|
| 1588 | 1588 |
list-style: none; |
| 1589 | 1589 |
background-color: #f5f5f5; |
| 1590 | 1590 |
border-radius: 4px; |
| 1591 | 1591 |
font-size:18px; |
| 1592 |
+ background:none; |
|
| 1592 | 1593 |
} |
| 1593 | 1594 |
|
| 1594 | 1595 |
.breadcrumb > li {
|
| ... | ... |
@@ -1744,7 +1745,8 @@ button.close {
|
| 1744 | 1745 |
.project-header {
|
| 1745 | 1746 |
background:#fafafa; |
| 1746 | 1747 |
border-bottom: none; |
| 1747 |
- margin-bottom:10px; |
|
| 1748 |
+ margin-top:3px; |
|
| 1749 |
+ margin-bottom:12px; |
|
| 1748 | 1750 |
overflow:hidden; |
| 1749 | 1751 |
padding:14px 0 0 0; |
| 1750 | 1752 |
} |
| ... | ... |
@@ -1838,10 +1840,11 @@ button.close {
|
| 1838 | 1840 |
border-radius:0; |
| 1839 | 1841 |
} |
| 1840 | 1842 |
|
| 1841 |
-.git-url-container input {
|
|
| 1843 |
+.git-url-container input[type=text] {
|
|
| 1842 | 1844 |
width:550px; |
| 1843 | 1845 |
padding:5px 0 5px 5px; |
| 1844 | 1846 |
border:1px solid #d8d8d8; |
| 1847 |
+ border-radius:0 3px 3px 0; |
|
| 1845 | 1848 |
} |
| 1846 | 1849 |
|
| 1847 | 1850 |
.page-path-container {
|
| ... | ... |
@@ -62,7 +62,7 @@ |
| 62 | 62 |
<div class="project-header"> |
| 63 | 63 |
<div class="container" style="overflow:hidden"> |
| 64 | 64 |
<div class="project-header-left"> |
| 65 |
- <ul class="breadcrumb" style="margin:0;background:none;padding-left:0;font-size:18px;"> |
|
| 65 |
+ <ul class="breadcrumb"> |
|
| 66 | 66 |
<li><a href="<%= url_for('/') %>"><i class="icon-home"></i></a></li>
|
| 67 | 67 |
/ |
| 68 | 68 |
<li><a href="<%= url_for("/$user") %>"><%= $user %></a></li>
|
| ... | ... |
@@ -100,24 +100,27 @@ |
| 100 | 100 |
</div> |
| 101 | 101 |
</div> |
| 102 | 102 |
% if (defined $project) {
|
| 103 |
+ <% |
|
| 104 |
+ my $tab = stash('tab') || 'code';
|
|
| 105 |
+ %> |
|
| 103 | 106 |
<div class="container"> |
| 104 | 107 |
<div class="project-tabs"> |
| 105 | 108 |
<div class="container"> |
| 106 | 109 |
<ul> |
| 107 |
- <li class="active"> |
|
| 110 |
+ <li class="<%= $tab eq 'code' ? 'active' : '' %>"> |
|
| 108 | 111 |
<a href="<%= url_for("/$user/$project") %>">
|
| 109 | 112 |
<i class="icon-chevron-right"></i> |
| 110 | 113 |
Code |
| 111 | 114 |
</a> |
| 112 | 115 |
</li> |
| 113 |
- <li> |
|
| 116 |
+ <li class="<%= $tab eq 'graph' ? 'active' : '' %>"> |
|
| 114 | 117 |
<a href="<%= url_for("/$user/$project/network") %>" >
|
| 115 | 118 |
<i class="icon-align-center"></i> |
| 116 | 119 |
Graph |
| 117 | 120 |
</a> |
| 118 | 121 |
</li> |
| 119 | 122 |
% if ($logined && $user eq session('user')) {
|
| 120 |
- <li> |
|
| 123 |
+ <li class="<%= $tab eq 'settings' ? 'active' : '' %>"> |
|
| 121 | 124 |
<a href="<%= url_for("/$user/$project/settings") %>">
|
| 122 | 125 |
<i class="icon-cog"></i> |
| 123 | 126 |
Settings |