| ... | ... |
@@ -1498,7 +1498,6 @@ button.close {
|
| 1498 | 1498 |
font-size:19px; |
| 1499 | 1499 |
font-weight:bold; |
| 1500 | 1500 |
margin:20px 0 15px 0; |
| 1501 |
- padding-left:8px; |
|
| 1502 | 1501 |
} |
| 1503 | 1502 |
|
| 1504 | 1503 |
.project-header {
|
| ... | ... |
@@ -2789,3 +2788,23 @@ button.close {
|
| 2789 | 2788 |
width:20%; |
| 2790 | 2789 |
text-align:right; |
| 2791 | 2790 |
} |
| 2791 |
+.graph-diff {
|
|
| 2792 |
+ width:800px; |
|
| 2793 |
+ overflow:auto; |
|
| 2794 |
+ padding-left:10px; |
|
| 2795 |
+ padding-right:10px; |
|
| 2796 |
+ |
|
| 2797 |
+ background-color: #f5f5f5; |
|
| 2798 |
+ border: 1px solid #e3e3e3; |
|
| 2799 |
+ padding:10px 10px 14px 10px; |
|
| 2800 |
+ margin-bottom:20px; |
|
| 2801 |
+ border-radius:3px; |
|
| 2802 |
+} |
|
| 2803 |
+.graph-document pre {
|
|
| 2804 |
+ background:#333333; |
|
| 2805 |
+ color:white; |
|
| 2806 |
+ padding:20px 20px 0px 20px; |
|
| 2807 |
+ border-radius:3px; |
|
| 2808 |
+ margin-bottom:15px; |
|
| 2809 |
+ margin-top:3px; |
|
| 2810 |
+} |
| ... | ... |
@@ -18,9 +18,9 @@ |
| 18 | 18 |
|
| 19 | 19 |
# Default branch |
| 20 | 20 |
my $default_branch = app->manager->default_branch($user, $project); |
| 21 |
-%> |
|
| 22 | 21 |
|
| 23 |
-% layout 'common', title => "Network \x{30fb} $user/$project";
|
|
| 22 |
+ layout 'common', title => "Network \x{30fb} $user/$project";
|
|
| 23 |
+%> |
|
| 24 | 24 |
|
| 25 | 25 |
%= javascript begin |
| 26 | 26 |
$(document).ready(function () {
|
| ... | ... |
@@ -45,9 +45,10 @@ |
| 45 | 45 |
$commit->{id} = $id;
|
| 46 | 46 |
push @$merged_commits, $commit; |
| 47 | 47 |
} |
| 48 |
+ |
|
| 49 |
+ layout 'common', title => "Network Graph $user/$project/$branch...$rev2_abs"; |
|
| 48 | 50 |
%> |
| 49 | 51 |
|
| 50 |
-% layout 'common', title => "Network Graph $user/$project/$branch...$rev2_abs"; |
|
| 51 | 52 |
%= include 'include/header'; |
| 52 | 53 |
|
| 53 | 54 |
%= javascript begin |
| ... | ... |
@@ -58,12 +59,12 @@ |
| 58 | 59 |
% end |
| 59 | 60 |
|
| 60 | 61 |
<div class="container"> |
| 61 |
- <h3>Graph</h3> |
|
| 62 |
+ <h3 class="topic1">Graph</h3> |
|
| 62 | 63 |
<div style="margin-bottom:20px">Compare 100 commits.</div> |
| 63 | 64 |
<div style="margin-bottom:10px"> |
| 64 | 65 |
<span style="color:blue;font-size:22px"><%= "$user / $project / $branch" %></span> |
| 65 | 66 |
</div> |
| 66 |
- <div id="graph" class="well" style="width:800px;overflow:auto;padding-left:10px;padding-right:10px"> |
|
| 67 |
+ <div id="graph" class="graph-diff"> |
|
| 67 | 68 |
<table> |
| 68 | 69 |
% for my $type (qw/local same remote/) {
|
| 69 | 70 |
<tr style="height:40px"> |
| ... | ... |
@@ -87,34 +88,37 @@ |
| 87 | 88 |
% } |
| 88 | 89 |
</table> |
| 89 | 90 |
</div> |
| 90 |
- <div style="margin-bottom:30px"> |
|
| 91 |
- <span style="color:green;font-size:22px"><%= "$remote_user / $remote_project / $remote_branch" %></span> |
|
| 92 |
- </div> |
|
| 93 |
- <hr> |
|
| 94 |
- <div style="margin-bottom:15px"> |
|
| 95 |
- <h4>Merging via command line</h4> |
|
| 96 |
- you can perform a manual merge on the command line. |
|
| 97 |
- </div> |
|
| 91 |
+ |
|
| 92 |
+ <div class="graph-document"> |
|
| 93 |
+ <div style="margin-bottom:30px"> |
|
| 94 |
+ <span style="color:green;font-size:22px"><%= "$remote_user / $remote_project / $remote_branch" %></span> |
|
| 95 |
+ </div> |
|
| 96 |
+ <hr> |
|
| 97 |
+ <div style="margin-bottom:15px"> |
|
| 98 |
+ <h4 class="topic1">Merging via command line</h4> |
|
| 99 |
+ you can perform a manual merge on the command line. |
|
| 100 |
+ </div> |
|
| 98 | 101 |
|
| 99 |
- <b>Step 1:</b> If you don't add user remote repository, add it. |
|
| 100 |
- <pre class="well" style="background:#333333;color:white;padding:20px 20px 0px 20px;"> |
|
| 102 |
+ <b>Step 1:</b> If you don't add user remote repository, add it. |
|
| 103 |
+ <pre> |
|
| 101 | 104 |
git remote add <%= $remote_user %> <%= url_for("/$remote_user/$remote_project.git")->to_abs %>
|
| 102 |
- </pre> |
|
| 105 |
+ </pre> |
|
| 103 | 106 |
|
| 104 |
- <b>Step 2:</b> From your project repository, bring in the changes and test. |
|
| 105 |
- <pre class="well" style="background:#333333;color:white;padding:20px 20px 0px 20px;"> |
|
| 107 |
+ <b>Step 2:</b> From your project repository, bring in the changes and test. |
|
| 108 |
+ <pre class="well" style="background:#333333;color:white;padding:20px 20px 0px 20px;"> |
|
| 106 | 109 |
git remote update |
| 107 | 110 |
git fetch |
| 108 | 111 |
git checkout -b <%= "$remote_user-$remote_branch" %> <%= "$remote_user/$remote_branch" %> |
| 109 | 112 |
git merge <%= $branch %> |
| 110 |
- </pre> |
|
| 111 |
- |
|
| 112 |
- <b>Step 3:</b> Merge the changes and update on GitHub. |
|
| 113 |
- <pre class="well" style="background:#333333;color:white;padding:20px 20px 0px 20px;"> |
|
| 113 |
+ </pre> |
|
| 114 |
+ |
|
| 115 |
+ <b>Step 3:</b> Merge the changes and update on GitHub. |
|
| 116 |
+ <pre class="well" style="background:#333333;color:white;padding:20px 20px 0px 20px;"> |
|
| 114 | 117 |
git checkout <%= $branch %> |
| 115 | 118 |
git merge <%= "$remote_user-$remote_branch" %> |
| 116 | 119 |
git push origin <%= $branch %> |
| 117 |
- </pre> |
|
| 120 |
+ </pre> |
|
| 121 |
+ </div> |
|
| 118 | 122 |
</div> |
| 119 | 123 |
|
| 120 | 124 |
%= include '/include/footer'; |