Mercurial > kallithea
changeset 4376:2ddd4fb23b4e
changelog: fix input line above the list - button size and floating
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 18 Jul 2014 19:22:01 +0200 |
| parents | 04717653fe48 |
| children | 0111c18298a0 |
| files | kallithea/templates/changelog/changelog.html |
| diffstat | 1 files changed, 18 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/templates/changelog/changelog.html Fri Jul 18 19:22:01 2014 +0200 +++ b/kallithea/templates/changelog/changelog.html Fri Jul 18 19:22:01 2014 +0200 @@ -40,12 +40,21 @@ <div> <div style="overflow:auto; display:${'none' if c.changelog_for_path else ''}"> <div class="container_header"> - <div style="float:right; margin: 0px 0px 0px 4px">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div> - <div class="info_box" style="text-align: right; float: right"> - <a href="#" class="btn btn-mini" id="rev_range_container" style="display:none"></a> - <a href="#" class="btn btn-mini" id="rev_range_clear" style="display:none">${_('Clear selection')}</a> + <div style="float:left; margin-left:20px;"> + ${h.form(h.url.current(),method='get')} + ${h.submit('set',_('Show'),class_="btn btn-small")} + ${h.text('size',size=1,value=c.size)} + ${_('revisions')} + %if c.branch_name: + ${h.hidden('branch', c.branch_name)} + %endif + ${h.end_form()} + </div> + <div style="float: right; margin: 0px 0px 0px 4px"> + <a href="#" class="btn btn-small" id="rev_range_container" style="display:none"></a> + <a href="#" class="btn btn-small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a> %if c.revision: - <a class="btn btn-mini" href="${h.url('changelog_home', repo_name=c.repo_name)}"> + <a class="btn btn-small" href="${h.url('changelog_home', repo_name=c.repo_name)}"> ${_('Go to tip of repository')} </a> %endif @@ -53,19 +62,12 @@ <a id="compare_fork" title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}" - class="btn btn-mini"><i class="icon-loop"></i> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)}</a> + class="btn btn-small"><i class="icon-loop"></i> ${_('Compare fork with parent repo (%s)' % c.db_repo.fork.repo_name)}</a> %endif ## text and href of open_new_pr is controlled from javascript - <a id="open_new_pr" class="btn btn-mini"></a> - </div> - - ${h.form(h.url.current(),method='get')} - <div style="float:left"> - ${h.submit('set',_('Show'),class_="btn btn-mini")} - ${h.text('size',size=1,value=c.size)} - ${_('revisions')} - </div> - ${h.end_form()} + <a id="open_new_pr" class="btn btn-small"></a> + ${h.select('branch_filter',c.branch_name,c.branch_filters)} + </div> </div> </div>