Mercurial > kallithea
changeset 6419:d99afb88579e
style: rename div.table to Bootstrap .panel-body
Based on work by Dominik Ruf.
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 Mon Jan 09 00:41:30 2017 +0100 @@ -1926,10 +1926,6 @@ text-align: left; } -.table { - position: relative; -} - #graph { position: relative; overflow: hidden; @@ -2141,10 +2137,10 @@ text-decoration: none; } -#compare_branches + .table .revision-link, -#compare_tags + .table .revision-link, -#compare_bookmarks + .table .revision-link, -.table #files_data .revision-link, +#compare_branches + div.panel-body .revision-link, +#compare_tags + div.panel-body .revision-link, +#compare_bookmarks + div.panel-body .revision-link, +div.panel-body #files_data .revision-link, #repos_list_wrap .revision-link, #shortlog_data .revision-link { font-weight: normal !important; @@ -3220,7 +3216,7 @@ } #content div.panel div.form, -#content div.panel div.table, +#content div.panel div.panel-body, #content div.panel div.traffic { position: relative; clear: both;
--- a/kallithea/templates/admin/admin.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/admin.html Mon Jan 09 00:41:30 2017 +0100 @@ -22,7 +22,7 @@ <div class="panel-heading clearfix"> ${self.breadcrumbs()} </div> - <div class="table"> + <div class="panel-body"> <div id="user_log"> <%include file='admin_log.html'/> </div>
--- a/kallithea/templates/admin/gists/edit.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/gists/edit.html Mon Jan 09 00:41:30 2017 +0100 @@ -28,7 +28,7 @@ ${self.breadcrumbs()} </div> - <div class="table"> + <div class="panel-body"> <div id="edit_error" style="display: none" class="flash_msg"> <div class="alert alert-dismissable alert-warning"> <button type="button" class="close" data-dismiss="alert" aria-hidden="true"><i class="icon-cancel-circled"></i></button>
--- a/kallithea/templates/admin/gists/index.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/gists/index.html Mon Jan 09 00:41:30 2017 +0100 @@ -66,7 +66,7 @@ ${c.gists_pager.pager(**request.GET.mixed())} </ul> %else: - <div class="table">${_('There are no gists yet')}</div> + <div>${_('There are no gists yet')}</div> %endif </div> </%def>
--- a/kallithea/templates/admin/gists/new.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/gists/new.html Mon Jan 09 00:41:30 2017 +0100 @@ -28,7 +28,7 @@ ${self.breadcrumbs()} </div> - <div class="table"> + <div class="panel-body"> <div id="files_data"> ${h.form(h.url('gists'), method='post',id='eform')} <div>
--- a/kallithea/templates/admin/gists/show.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/gists/show.html Mon Jan 09 00:41:30 2017 +0100 @@ -26,7 +26,7 @@ </div> %endif </div> - <div class="table"> + <div class="panel-body"> <div id="files_data"> <div id="body" class="codeblock"> <div class="code-header">
--- a/kallithea/templates/admin/my_account/my_account_repos.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/my_account/my_account_repos.html Mon Jan 09 00:41:30 2017 +0100 @@ -1,6 +1,6 @@ <h4>${_('Repositories You Own')}</h4> -<div class="table"> +<div> <table id="datatable_list_wrap"></table> </div>
--- a/kallithea/templates/admin/my_account/my_account_watched.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/my_account/my_account_watched.html Mon Jan 09 00:41:30 2017 +0100 @@ -1,6 +1,6 @@ <h4>${_('Repositories You are Watching')}</h4> -<div class="table"> +<div> <table id="datatable_list_wrap"></table> </div>
--- a/kallithea/templates/admin/notifications/notifications_data.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/notifications/notifications_data.html Mon Jan 09 00:41:30 2017 +0100 @@ -31,5 +31,5 @@ </ul> %else: - <div class="table">${_('No notifications here yet')}</div> + <div>${_('No notifications here yet')}</div> %endif
--- a/kallithea/templates/admin/notifications/show_notification.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/notifications/show_notification.html Mon Jan 09 00:41:30 2017 +0100 @@ -20,7 +20,7 @@ <div class="panel-heading clearfix"> ${self.breadcrumbs()} </div> - <div class="table"> + <div class="panel-body"> <div id="notification_${c.notification.notification_id}"> <div class="notification-header"> ${h.gravatar_div(c.notification.created_by_user.email, size=24)}
--- a/kallithea/templates/admin/repo_groups/repo_groups.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_groups.html Mon Jan 09 00:41:30 2017 +0100 @@ -26,7 +26,7 @@ %endif </div> </div> - <div class="table"> + <div class="panel-body"> <table id="datatable_list_wrap"></table> </div> </div>
--- a/kallithea/templates/admin/repos/repos.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/repos/repos.html Mon Jan 09 00:41:30 2017 +0100 @@ -24,7 +24,7 @@ %endif </div> </div> - <div class="table"> + <div class="panel-body"> <table id="datatable_list_wrap"></table> </div>
--- a/kallithea/templates/admin/user_groups/user_groups.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/user_groups/user_groups.html Mon Jan 09 00:41:30 2017 +0100 @@ -25,7 +25,7 @@ %endif </div> </div> - <div class="table"> + <div class="panel-body"> <table id="datatable_list_wrap"></table> </div> </div>
--- a/kallithea/templates/admin/users/users.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/admin/users/users.html Mon Jan 09 00:41:30 2017 +0100 @@ -23,7 +23,7 @@ <a href="${h.url('new_user')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Add User')}</a> </div> </div> - <div class="table"> + <div class="panel-body"> <table id="datatable_list_wrap"></table> </div> </div>
--- a/kallithea/templates/base/perms_summary.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/base/perms_summary.html Mon Jan 09 00:41:30 2017 +0100 @@ -4,7 +4,7 @@ ## ${p.perms_summary(c.perm_user.permissions)} <%def name="perms_summary(permissions, show_all=False, actions=True)"> -<div id="perms" class="table"> +<div id="perms"> %for section in sorted(permissions.keys()): <div class="perms_section_head"> <h4>${section.replace("_"," ").capitalize()}</h4>
--- a/kallithea/templates/changelog/changelog.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/changelog/changelog.html Mon Jan 09 00:41:30 2017 +0100 @@ -31,7 +31,7 @@ <div class="panel-heading clearfix"> ${self.breadcrumbs()} </div> - <div class="table"> + <div class="panel-body"> %if c.pagination: <div> <div style="overflow:auto; ${'display:none' if c.changelog_for_path else ''}">
--- a/kallithea/templates/changeset/changeset.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/changeset/changeset.html Mon Jan 09 00:41:30 2017 +0100 @@ -19,16 +19,16 @@ <%def name="main()"> ${self.repo_context_bar('changelog', c.changeset.raw_id)} <div class="panel panel-primary"> - <div class="panel-heading clearfix"> - ${self.breadcrumbs()} - </div> - <script> + <div class="panel-heading clearfix"> + ${self.breadcrumbs()} + </div> + <script> var _USERS_AC_DATA = ${c.users_array|n}; var _GROUPS_AC_DATA = ${c.user_groups_array|n}; AJAX_COMMENT_URL = "${url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id)}"; AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}"; - </script> - <div class="table"> + </script> + <div class="panel-body"> <div class="diffblock"> <div class="parents"> <div id="parent_link" class="changeset_hash"> @@ -299,5 +299,5 @@ </script> - </div> + </div> </%def>
--- a/kallithea/templates/changeset/changeset_range.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/changeset/changeset_range.html Mon Jan 09 00:41:30 2017 +0100 @@ -22,7 +22,7 @@ <div class="panel-heading clearfix"> ${self.breadcrumbs()} </div> - <div class="table"> + <div class="panel-body"> <div id="body" class="diffblock"> <div class="code-header"> <div>
--- a/kallithea/templates/compare/compare_diff.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/compare/compare_diff.html Mon Jan 09 00:41:30 2017 +0100 @@ -23,7 +23,7 @@ <div class="panel-heading clearfix"> ${self.breadcrumbs()} </div> - <div class="table"> + <div class="panel-body"> <div id="body" class="diffblock"> <div class="compare-revision-selector"> ## divs are "inline-block" and cannot have whitespace between them.
--- a/kallithea/templates/errors/error_document.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/errors/error_document.html Mon Jan 09 00:41:30 2017 +0100 @@ -32,8 +32,7 @@ </head> <body> <%include file="/base/flash_msg.html"/> - <div id="login"> - <div class="table"> + <div> <div id="main_div"> <h2>${c.site_name}</h2> <h1 class="error_message">${c.error_message}</h1> @@ -41,7 +40,6 @@ <p>${c.error_explanation}</p> </div> - </div> </div> </body>
--- a/kallithea/templates/files/files.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/files/files.html Mon Jan 09 00:41:30 2017 +0100 @@ -29,7 +29,7 @@ ${_("Branch filter:")} ${h.select('branch_selector',c.changeset.raw_id,c.revision_options)} </div> </div> - <div class="table"> + <div class="panel-body"> <div id="files_data"> <%include file='files_ypjax.html'/> </div>
--- a/kallithea/templates/files/files_add.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/files/files_add.html Mon Jan 09 00:41:30 2017 +0100 @@ -32,7 +32,7 @@ <a href="#">${_('Branch')}: ${c.cs.branch}</a> </div> </div> - <div class="table" id="edit"> + <div class="panel-body" id="edit"> <div id="files_data"> ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data", class_="form-horizontal form-inline")} <h3 class="files_location">
--- a/kallithea/templates/files/files_delete.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/files/files_delete.html Mon Jan 09 00:41:30 2017 +0100 @@ -23,7 +23,7 @@ <a href="#">${_('Branch')}: ${c.cs.branch}</a> </div> </div> - <div class="table" id="edit"> + <div class="panel-body" id="edit"> <div id="files_data"> ${h.form(h.url.current(),method='post',class_="form-horizontal")} <h3 class="files_location">
--- a/kallithea/templates/files/files_edit.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/files/files_edit.html Mon Jan 09 00:41:30 2017 +0100 @@ -32,7 +32,7 @@ <a href="#">${_('Branch')}: ${c.cs.branch}</a> </div> </div> - <div class="table" id="edit"> + <div class="panel-body" id="edit"> <div id="files_data"> <h3 class="files_location">${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.file.path)}</h3> ${h.form(h.url.current(),method='post',id='eform',class_='form-inline')}
--- a/kallithea/templates/followers/followers.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/followers/followers.html Mon Jan 09 00:41:30 2017 +0100 @@ -19,7 +19,7 @@ <div class="panel-heading clearfix"> ${self.breadcrumbs()} </div> - <div class="table"> + <div class="panel-body"> <div id="followers"> <%include file='followers_data.html'/> </div>
--- a/kallithea/templates/forks/forks.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/forks/forks.html Mon Jan 09 00:41:30 2017 +0100 @@ -19,7 +19,7 @@ <div class="panel-heading clearfix"> ${self.breadcrumbs()} </div> - <div class="table"> + <div class="panel-body"> <div id="forks"> <%include file='forks_data.html'/> </div>
--- a/kallithea/templates/index_base.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/index_base.html Mon Jan 09 00:41:30 2017 +0100 @@ -42,7 +42,7 @@ %endif </div> %if c.groups: - <div class="table"> + <div class="panel-body"> <div id='groups_list_wrap'> <table id="groups_list"> <thead> @@ -74,7 +74,7 @@ </div> </div> %endif - <div class="table"> + <div> <table id="repos_list_wrap"></table> </div> </div>
--- a/kallithea/templates/pullrequests/pullrequest_show.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Mon Jan 09 00:41:30 2017 +0100 @@ -285,7 +285,7 @@ <div class="panel-heading clearfix"> <div class="breadcrumbs">${_('Pull Request Content')}</div> </div> - <div class="table"> + <div class="panel-body"> <div id="changeset_compare_view_content"> <h5> ${comment.comment_count(c.inline_cnt, len(c.comments))}
--- a/kallithea/templates/search/search_commit.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/search/search_commit.html Mon Jan 09 00:41:30 2017 +0100 @@ -2,7 +2,6 @@ %for cnt,sr in enumerate(c.formated_results): %if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(sr['repository'],'search results check'): - <div class="table"> <div id="body${cnt}" class="codeblock"> <div class="code-header"> <div class="search-path">${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['raw_id'])), @@ -25,14 +24,11 @@ %endif </div> </div> - </div> %else: %if cnt == 0: - <div class="table"> <div id="body${cnt}" class="codeblock"> <div class="error">${_('Permission denied')}</div> </div> - </div> %endif %endif %endfor
--- a/kallithea/templates/search/search_content.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/search/search_content.html Mon Jan 09 00:41:30 2017 +0100 @@ -2,7 +2,6 @@ %for cnt,sr in enumerate(c.formated_results): %if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(sr['repository'],'search results check'): - <div class="table"> <div id="body${cnt}" class="codeblock"> <div class="code-header"> <div class="search-path">${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['f_path'])), @@ -13,10 +12,9 @@ <pre>${h.literal(sr['content_short_hl'])}</pre> </div> </div> - </div> %else: %if cnt == 0: - <div class="table"> + <div> <div id="body${cnt}" class="codeblock"> <div class="error">${_('Permission denied')}</div> </div>
--- a/kallithea/templates/summary/summary.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/summary/summary.html Mon Jan 09 00:41:30 2017 +0100 @@ -179,7 +179,7 @@ %endif </div> </div> - <div class="table"> + <div class="panel-body"> <div id="shortlog_data"> <%include file='../changelog/changelog_summary_data.html'/> </div>
--- a/kallithea/tests/functional/test_admin_notifications.py Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/tests/functional/test_admin_notifications.py Mon Jan 09 00:41:30 2017 +0100 @@ -23,7 +23,7 @@ Session().commit() response = self.app.get(url('notifications')) - response.mustcontain('<div class="table">No notifications here yet</div>') + response.mustcontain('<div>No notifications here yet</div>') with test_context(self.app): cur_user = self._get_logged_user()