# HG changeset patch # User Marcin Kuzminski # Date 2017-04-04 15:28:09 # Node ID 001d22841cb262333cf46ade66bd655fd389ec87 # Parent 05cad934f4db8a4df4500a1210d91c2e678a3d46 strip: ui changes. - make full buttons clickable not only icons - fix margin on dynamic buttons - small html cleanups diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less --- a/rhodecode/public/css/main.less +++ b/rhodecode/public/css/main.less @@ -760,7 +760,7 @@ label { input { display: inline; - margin-top: 3px; + margin: 3px 5px 0px 0px; } br { diff --git a/rhodecode/templates/admin/repos/repo_edit_strip.mako b/rhodecode/templates/admin/repos/repo_edit_strip.mako --- a/rhodecode/templates/admin/repos/repo_edit_strip.mako +++ b/rhodecode/templates/admin/repos/repo_edit_strip.mako @@ -1,12 +1,10 @@
-

${_('Strip')}

+

${_('Strip commits from repository')}

%if c.repo_info.repo_type != 'svn': -

-

${_('Please provide up to %s commits commits to strip')%c.strip_limit}

-

+

${_('Please provide up to %d commits commits to strip') % c.strip_limit}

${_('In the first step commits will be verified for existance in the repository')}.
${_('In the second step, correct commits will be available for stripping')}. @@ -14,26 +12,25 @@ ${h.secure_form(h.route_path('strip_check', repo_name=c.repo_info.repo_name), method='post')}

- -
- ${_('Add another commit')} -
+ +
+ ${_('Add another commit')} +
- + + +
-
- ${h.end_form()} %else: -

-

${_('Sorry this functionality is not available for SVN repository')}

-

+

${_('Sorry this functionality is not available for SVN repository')}

%endif
@@ -46,15 +43,16 @@ addNew = function(number){ if (number >= ${c.strip_limit}){ return; } - var minus = '${_('Remove')}'; + var minus = '${_('Remove')}'; $('#plus_icon-'+number).detach(); number++; + var input = '
'+ ''+ - '
'+ - '${_('Add another commit')}'+ + '
'+ + '${_('Add another commit')}'+ '
'+ - '
'+ + '
'+ minus + '
' + '
'; @@ -90,8 +88,8 @@ delOld = function(number){ $('#box-'+number).remove(); number = number - 1; var box = $('#box-'+number); - var plus = '
'+ - '${_('Add another commit')}
'; + var plus = '
'+ + '${_('Add another commit')}
'; var minus = $('#minus_icon-'+number); if(number +1 == plus_leaf){ minus.detach(); @@ -123,10 +121,10 @@ checkCommits = function() { if (value.rev){ result_data[index] = JSON.stringify(value); msg = '${_("author")}: ' + value.author + ' ${_("comment")}: ' + value.comment; - result += '

' +value.rev+ '${_(' commit verified positive')}
'+ msg + '

'; + result += '

' +value.rev+ '${_(' commit verified positive')}
'+ msg + '

'; } else{ - result += '

' +value.commit+ '${_('commit verified negative')}' + '

'; + result += '

' +value.commit+ '${_(' commit verified negative')}' + '

'; } box.remove(); });