Show More
@@ -760,7 +760,7 b' label {' | |||||
760 |
|
760 | |||
761 | input { |
|
761 | input { | |
762 | display: inline; |
|
762 | display: inline; | |
763 |
margin |
|
763 | margin: 3px 5px 0px 0px; | |
764 | } |
|
764 | } | |
765 |
|
765 | |||
766 | br { |
|
766 | br { |
@@ -1,12 +1,10 b'' | |||||
1 | <div class="panel panel-default"> |
|
1 | <div class="panel panel-default"> | |
2 | <div class="panel-heading"> |
|
2 | <div class="panel-heading"> | |
3 | <h3 class="panel-title">${_('Strip')}</h3> |
|
3 | <h3 class="panel-title">${_('Strip commits from repository')}</h3> | |
4 | </div> |
|
4 | </div> | |
5 | <div class="panel-body"> |
|
5 | <div class="panel-body"> | |
6 | %if c.repo_info.repo_type != 'svn': |
|
6 | %if c.repo_info.repo_type != 'svn': | |
7 | <p> |
|
7 | <h4>${_('Please provide up to %d commits commits to strip') % c.strip_limit}</h4> | |
8 | <h4>${_('Please provide up to %s commits commits to strip')%c.strip_limit}</h4> |
|
|||
9 | </p> |
|
|||
10 | <p> |
|
8 | <p> | |
11 | ${_('In the first step commits will be verified for existance in the repository')}. </br> |
|
9 | ${_('In the first step commits will be verified for existance in the repository')}. </br> | |
12 | ${_('In the second step, correct commits will be available for stripping')}. |
|
10 | ${_('In the second step, correct commits will be available for stripping')}. | |
@@ -14,26 +12,25 b'' | |||||
14 | ${h.secure_form(h.route_path('strip_check', repo_name=c.repo_info.repo_name), method='post')} |
|
12 | ${h.secure_form(h.route_path('strip_check', repo_name=c.repo_info.repo_name), method='post')} | |
15 | <div id="change_body" class="field"> |
|
13 | <div id="change_body" class="field"> | |
16 | <div id="box-1" class="inputx locked_input"> |
|
14 | <div id="box-1" class="inputx locked_input"> | |
17 |
<input class="text" id="changeset_id-1" name="changeset_id-1" |
|
15 | <input class="text" id="changeset_id-1" name="changeset_id-1" size="59" | |
18 |
placeholder="${_('Enter full 40 character commit sha')}" |
|
16 | placeholder="${_('Enter full 40 character commit sha')}" type="text" value=""> | |
19 |
|
|
17 | <div id="plus_icon-1" class="btn btn-default plus_input_button" onclick="addNew(1);return false"> | |
20 |
|
|
18 | <i class="icon-plus">${_('Add another commit')}</i> | |
21 |
|
|
19 | </div> | |
22 | </div> |
|
20 | </div> | |
23 | </div> |
|
21 | </div> | |
24 | <div id="results" style="display:none; padding: 10px 0px;"></div> |
|
22 | ||
|
23 | <div id="results" style="display:none; padding: 10px 0px;"></div> | |||
|
24 | ||||
25 | <div class="buttons"> |
|
25 | <div class="buttons"> | |
26 |
|
|
26 | <button class="btn btn-small btn-primary" onclick="checkCommits();return false"> | |
27 | ${_('Check commits')} |
|
27 | ${_('Check commits')} | |
28 | </button> |
|
28 | </button> | |
29 | </div> |
|
29 | </div> | |
30 | <div id="results" style="display:none; padding: 10px 0px;"></div> |
|
|||
31 |
|
30 | |||
32 | ${h.end_form()} |
|
31 | ${h.end_form()} | |
33 | %else: |
|
32 | %else: | |
34 | <p> |
|
33 | <h4>${_('Sorry this functionality is not available for SVN repository')}</h4> | |
35 | <h4>${_('Sorry this functionality is not available for SVN repository')}</h4> |
|
|||
36 | </p> |
|
|||
37 | %endif |
|
34 | %endif | |
38 | </div> |
|
35 | </div> | |
39 | </div> |
|
36 | </div> | |
@@ -46,15 +43,16 b' addNew = function(number){' | |||||
46 | if (number >= ${c.strip_limit}){ |
|
43 | if (number >= ${c.strip_limit}){ | |
47 | return; |
|
44 | return; | |
48 | } |
|
45 | } | |
49 |
var minus = '<i id="i_minus_icon-'+(number+1)+'" class="icon-minus" |
|
46 | var minus = '<i id="i_minus_icon-'+(number+1)+'" class="icon-minus">${_('Remove')}</i>'; | |
50 | $('#plus_icon-'+number).detach(); |
|
47 | $('#plus_icon-'+number).detach(); | |
51 | number++; |
|
48 | number++; | |
|
49 | ||||
52 | var input = '<div id="box-'+number+'" class="inputx locked_input">'+ |
|
50 | var input = '<div id="box-'+number+'" class="inputx locked_input">'+ | |
53 | '<input class="text" id="changeset_id-'+number+'" name="changeset_id-'+number+'" size="59" type="text" value="">'+ |
|
51 | '<input class="text" id="changeset_id-'+number+'" name="changeset_id-'+number+'" size="59" type="text" value="">'+ | |
54 |
|
|
52 | '<div id="plus_icon-'+number+'" class="btn btn-default plus_input_button" onclick="addNew('+number+');return false">'+ | |
55 |
'<i id="i_plus_icon-'+(number)+'" class="icon-plus" |
|
53 | '<i id="i_plus_icon-'+(number)+'" class="icon-plus">${_('Add another commit')}</i>'+ | |
56 | '</div>'+ |
|
54 | '</div>'+ | |
57 |
|
|
55 | '<div id="minus_icon-'+number+'" class="btn btn-default minus_input_button" onclick="delOld('+(number)+');return false">'+ | |
58 | minus + |
|
56 | minus + | |
59 | '</div>' + |
|
57 | '</div>' + | |
60 | '</div>'; |
|
58 | '</div>'; | |
@@ -90,8 +88,8 b' delOld = function(number){' | |||||
90 | $('#box-'+number).remove(); |
|
88 | $('#box-'+number).remove(); | |
91 | number = number - 1; |
|
89 | number = number - 1; | |
92 | var box = $('#box-'+number); |
|
90 | var box = $('#box-'+number); | |
93 | var plus = '<div id="plus_icon-'+number+'" class="btn btn-default plus_input_button">'+ |
|
91 | var plus = '<div id="plus_icon-'+number+'" class="btn btn-default plus_input_button" onclick="addNew('+number +');return false">'+ | |
94 |
'<i id="i_plus_icon-'+number+'" class="icon-plus" |
|
92 | '<i id="i_plus_icon-'+number+'" class="icon-plus">${_('Add another commit')}</i></div>'; | |
95 | var minus = $('#minus_icon-'+number); |
|
93 | var minus = $('#minus_icon-'+number); | |
96 | if(number +1 == plus_leaf){ |
|
94 | if(number +1 == plus_leaf){ | |
97 | minus.detach(); |
|
95 | minus.detach(); | |
@@ -123,10 +121,10 b' checkCommits = function() {' | |||||
123 | if (value.rev){ |
|
121 | if (value.rev){ | |
124 | result_data[index] = JSON.stringify(value); |
|
122 | result_data[index] = JSON.stringify(value); | |
125 | msg = '${_("author")}: ' + value.author + ' ${_("comment")}: ' + value.comment; |
|
123 | msg = '${_("author")}: ' + value.author + ' ${_("comment")}: ' + value.comment; | |
126 | result += '<h4>' +value.rev+ '${_(' commit verified positive')}</br> '+ msg + '</h4>'; |
|
124 | result += '<h4><code>' +value.rev+ '</code>${_(' commit verified positive')}</br> '+ msg + '</h4>'; | |
127 | } |
|
125 | } | |
128 | else{ |
|
126 | else{ | |
129 | result += '<h4>' +value.commit+ '${_('commit verified negative')}' + '</h4>'; |
|
127 | result += '<h4><code>' +value.commit+ '</code>${_(' commit verified negative')}' + '</h4>'; | |
130 | } |
|
128 | } | |
131 | box.remove(); |
|
129 | box.remove(); | |
132 | }); |
|
130 | }); |
General Comments 0
You need to be logged in to leave comments.
Login now