| ... | ... |
@@ -2808,3 +2808,52 @@ button.close {
|
| 2808 | 2808 |
margin-bottom:15px; |
| 2809 | 2809 |
margin-top:3px; |
| 2810 | 2810 |
} |
| 2811 |
+ |
|
| 2812 |
+.import-branch {
|
|
| 2813 |
+ overflow:hidden; |
|
| 2814 |
+} |
|
| 2815 |
+.import-branch > .left {
|
|
| 2816 |
+ float:left; |
|
| 2817 |
+ width:45%; |
|
| 2818 |
+} |
|
| 2819 |
+.import-branch > .center {
|
|
| 2820 |
+ float:left; |
|
| 2821 |
+ width:10%; |
|
| 2822 |
+ text-align:center; |
|
| 2823 |
+ padding: 19px; |
|
| 2824 |
+ text-align:center; |
|
| 2825 |
+ font-size:26px; |
|
| 2826 |
+} |
|
| 2827 |
+.import-branch > .right {
|
|
| 2828 |
+ float:left; |
|
| 2829 |
+ width:45%; |
|
| 2830 |
+} |
|
| 2831 |
+.import-branch select {
|
|
| 2832 |
+ border:1px solid #d8d8d8; |
|
| 2833 |
+ border-radius: 3px; |
|
| 2834 |
+ padding:6px 5px; |
|
| 2835 |
+ width:30%; |
|
| 2836 |
+} |
|
| 2837 |
+.import-branch-from, .import-branch-to {
|
|
| 2838 |
+ border:1px solid #d8d8d8; |
|
| 2839 |
+ border-radius:3px; |
|
| 2840 |
+ padding:25px 15px; |
|
| 2841 |
+} |
|
| 2842 |
+.import-branch-to > :first-child {
|
|
| 2843 |
+ font-size:20px; |
|
| 2844 |
+ color:blue; |
|
| 2845 |
+ margin-bottom:10px; |
|
| 2846 |
+} |
|
| 2847 |
+.import-branch-from > :first-child {
|
|
| 2848 |
+ font-size:20px; |
|
| 2849 |
+ color:green; |
|
| 2850 |
+ margin-bottom:10px; |
|
| 2851 |
+} |
|
| 2852 |
+.import-branch-button-panel {
|
|
| 2853 |
+ margin-top:10px; |
|
| 2854 |
+} |
|
| 2855 |
+.import-branch-button-panel > div {
|
|
| 2856 |
+ display:table-cell; |
|
| 2857 |
+ vertical-align:middle; |
|
| 2858 |
+ padding:0 3px; |
|
| 2859 |
+} |
| ... | ... |
@@ -96,9 +96,10 @@ |
| 96 | 96 |
$errors = $vresult->messages; |
| 97 | 97 |
} |
| 98 | 98 |
} |
| 99 |
+ |
|
| 100 |
+ layout 'common', title => "Import branch"; |
|
| 99 | 101 |
%> |
| 100 | 102 |
|
| 101 |
-% layout 'common', title => "Import branch"; |
|
| 102 | 103 |
%= include 'include/header'; |
| 103 | 104 |
|
| 104 | 105 |
%= javascript begin |
| ... | ... |
@@ -106,7 +107,7 @@ |
| 106 | 107 |
|
| 107 | 108 |
// Select remote branch |
| 108 | 109 |
$('[name=copy-branch-name]').on('click', function () {
|
| 109 |
- $('[name=branch]').val($('[name=remote_branch]').val());
|
|
| 110 |
+ $('[name=branch]').val($('[name=remote-branch]').val());
|
|
| 110 | 111 |
return false; |
| 111 | 112 |
}); |
| 112 | 113 |
}); |
| ... | ... |
@@ -127,45 +128,43 @@ |
| 127 | 128 |
% } |
| 128 | 129 |
</div> |
| 129 | 130 |
% } |
| 130 |
- <h3>Import branch</h3> |
|
| 131 |
+ <h3 class="topic1">Import branch</h3> |
|
| 131 | 132 |
<form action="<%= url_for("/$user/$project/import-branch/$remote_user/$remote_project")->query(op => 'import') %>" method="post">
|
| 132 |
- <div class="row" style="font-size:22px"> |
|
| 133 |
- <div class="span6"> |
|
| 134 |
- <div class="well" style="text-align:center"> |
|
| 135 |
- <div style="color:blue;margin-bottom:15px"> |
|
| 133 |
+ <div class="import-branch"> |
|
| 134 |
+ <div class="left"> |
|
| 135 |
+ <div class="import-branch-to"> |
|
| 136 |
+ <div> |
|
| 136 | 137 |
%= "$user / $project"; |
| 137 | 138 |
</div> |
| 138 | 139 |
<div> |
| 139 |
- %= text_field 'branch', placeholder => "Branch name", style => "margin-top:12px;width:250px"; |
|
| 140 |
+ %= text_field 'branch', placeholder => "Branch name", style => "width:250px"; |
|
| 140 | 141 |
<button name="copy-branch-name", class="btn" style="font-size:12px; padding-left:3px;padding-right:3px;color:#666">Copy Branch Name</button> |
| 141 | 142 |
</div> |
| 142 |
- <table style="width:100%"> |
|
| 143 |
- <tr> |
|
| 144 |
- <td style="width:80px;text-align:right"> |
|
| 145 |
- %= submit_button 'Import', class => "btn"; |
|
| 146 |
- </td> |
|
| 147 |
- <td style="width:20px;"> |
|
| 148 |
- <%= check_box force => 1 %> |
|
| 149 |
- </td> |
|
| 150 |
- <td style="font-size:13px;padding-top:7px;text-align:left"> |
|
| 151 |
- Force |
|
| 152 |
- </td> |
|
| 153 |
- </tr> |
|
| 154 |
- </table> |
|
| 143 |
+ <div class="import-branch-button-panel"> |
|
| 144 |
+ <div> |
|
| 145 |
+ %= submit_button 'Import', class => "btn btn-info"; |
|
| 146 |
+ </div> |
|
| 147 |
+ <div> |
|
| 148 |
+ <%= check_box force => 1 %> |
|
| 149 |
+ </div> |
|
| 150 |
+ <div> |
|
| 151 |
+ Force |
|
| 152 |
+ </div> |
|
| 153 |
+ </div> |
|
| 155 | 154 |
</div> |
| 156 | 155 |
</div> |
| 157 |
- <div class="span1"> |
|
| 158 |
- <div style="padding: 19px;text-align:center;font-size:26px"> |
|
| 159 |
- ⇐ |
|
| 160 |
- </div> |
|
| 156 |
+ <div class="center"> |
|
| 157 |
+ ⇐ |
|
| 161 | 158 |
</div> |
| 162 |
- <div class="span5"> |
|
| 163 |
- <div class="well" style="text-align:center"> |
|
| 164 |
- <div style="color:green;margin-bottom:15px"> |
|
| 159 |
+ <div class="right"> |
|
| 160 |
+ <div class="import-branch-from"> |
|
| 161 |
+ <div> |
|
| 165 | 162 |
%= "$remote_user / $remote_project"; |
| 166 | 163 |
</div> |
| 167 |
- % param(remote_branch => $remote_branch); |
|
| 168 |
- %= select_field 'remote-branch' => $remote_branch_names, style => "width:250px"; |
|
| 164 |
+ <div> |
|
| 165 |
+ % param('remote-branch' => $remote_branch);
|
|
| 166 |
+ %= select_field 'remote-branch' => $remote_branch_names, style => "width:250px"; |
|
| 167 |
+ </div> |
|
| 169 | 168 |
</div> |
| 170 | 169 |
</div> |
| 171 | 170 |
</div> |