Mercurial > kallithea
changeset 6415:b172a000249d
style: drop unnecessary <ul> markup
Based on work by Dominik Ruf.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sat, 24 Dec 2016 17:26:48 +0100 |
| parents | 41dd3c2f820c |
| children | ba18d1f6d081 |
| files | kallithea/public/css/style.css kallithea/templates/admin/repo_groups/repo_group_edit.html kallithea/templates/admin/repos/repo_edit_advanced.html kallithea/templates/admin/repos/repo_edit_caches.html kallithea/templates/admin/repos/repo_edit_statistics.html kallithea/templates/journal/journal.html kallithea/templates/pullrequests/pullrequest_show.html |
| diffstat | 7 files changed, 34 insertions(+), 52 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/public/css/style.css Sat Dec 24 17:26:48 2016 +0100 @@ -572,13 +572,17 @@ padding: 11px 10px 11px 10px; } -#content div.panel div.panel-heading ul.links.icon-only-links li a { +#content div.panel div.panel-heading .links.icon-only-links a { float: left; color: #fff; margin: 0; padding: 11px 10px 11px 10px; } +#content div.panel div.panel-heading .links.icon-only-links { + float: right; +} + #content div.panel h1, #content div.panel h2, #content div.panel h3,
--- a/kallithea/templates/admin/repo_groups/repo_group_edit.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit.html Sat Dec 24 17:26:48 2016 +0100 @@ -15,14 +15,6 @@ » ${h.link_to(c.repo_group.name,h.url('repos_group_home',group_name=c.repo_group.group_name))} </%def> -<%def name="breadcrumbs_side_links()"> - <ul class="links"> - <li> - <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add Child Group')}</a> - </li> - </ul> -</%def> - <%block name="header_menu"> ${self.menu('admin')} </%block> @@ -31,7 +23,11 @@ <div class="panel panel-primary" style="overflow:auto"> <div class="panel-heading clearfix"> ${self.breadcrumbs()} - ${self.breadcrumbs_side_links()} + <ul class="links"> + <li> + <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add Child Group')}</a> + </li> + </ul> </div> ##main
--- a/kallithea/templates/admin/repos/repo_edit_advanced.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/repos/repo_edit_advanced.html Sat Dec 24 17:26:48 2016 +0100 @@ -3,10 +3,8 @@ <div class="form"> ${h.select('id_fork_of','',c.repos_list)} ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="btn btn-default btn-sm")} - <div class="text-muted" style="border:none"> - <ul> - <li>${_('''Manually set this repository as a fork of another from the list.''')}</li> - </ul> + <div class="text-muted"> + ${_('''Manually set this repository as a fork of another from the list.''')} </div> </div> ${h.end_form()} @@ -35,10 +33,8 @@ </button> %endif </div> - <div class="text-muted" style="border:none"> - <ul> - <li>${_('All actions done in this repository will be visible to everyone in the public journal.')}</li> - </ul> + <div class="text-muted"> + ${_('All actions done in this repository will be visible to everyone in the public journal.')} </div> </div> ${h.end_form()} @@ -63,11 +59,8 @@ </button> ${_('Repository is not locked')} %endif - <div class="text-muted" style="border:none"> - <ul> - <li>${_('Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository. The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push.')} - </li> - </ul> + <div class="text-muted"> + ${_('Force locking on the repository. Works only when anonymous access is disabled. Triggering a pull locks the repository. The user who is pulling locks the repository; only the user who pulled and locked it can unlock it by doing a push.')} </div> </div> ${h.end_form()} @@ -91,10 +84,8 @@ ${_('Delete forks')} </label> %endif - <div class="text-muted" style="border:none"> - <ul> - <li>${_('The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it.')}</li> - </ul> + <div class="text-muted"> + ${_('The deleted repository will be moved away and hidden until the administrator expires it. The administrator can both permanently delete it or restore it.')} </div> </div> ${h.end_form()}
--- a/kallithea/templates/admin/repos/repo_edit_caches.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/repos/repo_edit_caches.html Sat Dec 24 17:26:48 2016 +0100 @@ -2,13 +2,10 @@ <div class="form"> <div> ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate Repository Cache'),class_="btn btn-default btn-sm")} - <div class="text-muted" style="border:none"> - <ul> - <li>${_('Manually invalidate cache for this repository. On first access, the repository will be cached again.')} - </li> - </ul> + <div class="text-muted"> + ${_('Manually invalidate cache for this repository. On first access, the repository will be cached again.')} </div> - <div style="border:none;"> + <div> <h5>${_('List of Cached Values')}</h5> <table class="table"> <tr>
--- a/kallithea/templates/admin/repos/repo_edit_statistics.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/repos/repo_edit_statistics.html Sat Dec 24 17:26:48 2016 +0100 @@ -1,13 +1,15 @@ ${h.form(url('edit_repo_statistics_update', repo_name=c.repo_info.repo_name))} <div class="form"> <div class="form-horizontal"> - <div class="text-muted" style="border:none;color:#888"> - <ul> + <div class="form-group text-muted"> + <ul class="list-unstyled"> <li>${_('Processed commits')}: ${c.stats_revision}/${c.repo_last_rev}</li> <li>${_('Processed progress')}: ${c.stats_percentage}%</li> </ul> - </div> + </div> + <div class="form-group"> ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset Statistics'),class_="btn btn-default btn-sm",onclick="return confirm('"+_('Confirm to remove current statistics.')+"');")} + </div> </div> </div> ${h.end_form()}
--- a/kallithea/templates/journal/journal.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/journal/journal.html Sat Dec 24 17:26:48 2016 +0100 @@ -22,21 +22,13 @@ <%def name="main()"> <div class="panel panel-primary"> <div class="panel-heading clearfix"> - ${self.breadcrumbs()} - <ul class="links icon-only-links"> - <li> - <a href="${h.url('my_account_watched')}"><i class="icon-eye"></i> ${_('Watched Repositories')}</a> - </li> - <li> - <a href="${h.url('my_account_repos')}"><i class="icon-database"></i> ${_('My Repositories')}</a> - </li> - <li> - <span><a id="refresh" href="${h.url('journal')}"><i class="icon-arrows-cw"></i></a></span> - </li> - <li> - <span><a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a></span> - </li> - </ul> + ${self.breadcrumbs()} + <div class="links icon-only-links panel-title"> + <a href="${h.url('my_account_watched')}"><i class="icon-eye"></i> ${_('Watched Repositories')}</a> + <a href="${h.url('my_account_repos')}"><i class="icon-database"></i> ${_('My Repositories')}</a> + <a id="refresh" href="${h.url('journal')}"><i class="icon-arrows-cw"></i></a> + <a href="${h.url('journal_atom', api_key=c.authuser.api_key)}"><i class="icon-rss-squared"></i></a> + </div> </div> <div id="journal"> <%include file='journal_data.html'/>
--- a/kallithea/templates/pullrequests/pullrequest_show.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Sat Dec 24 17:26:48 2016 +0100 @@ -214,7 +214,7 @@ %for member,status in c.pull_request_reviewers: <input type="hidden" value="${member.user_id}" name="org_review_members" /> %endfor - <ul id="review_members"> + <ul id="review_members" class="list-unstyled"> %for member,status in c.pull_request_reviewers: ## WARNING: the HTML below is duplicate with ## kallithea/public/js/base.js