diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css --- a/kallithea/public/css/style.css +++ b/kallithea/public/css/style.css @@ -1926,10 +1926,6 @@ BIN_FILENODE = 6 text-align: left; } -.table { - position: relative; -} - #graph { position: relative; overflow: hidden; @@ -2141,10 +2137,10 @@ BIN_FILENODE = 6 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 @@ div#legend_data, div#legend_container, d } #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; diff --git a/kallithea/templates/admin/admin.html b/kallithea/templates/admin/admin.html --- a/kallithea/templates/admin/admin.html +++ b/kallithea/templates/admin/admin.html @@ -22,7 +22,7 @@
${self.breadcrumbs()}
-
+
<%include file='admin_log.html'/>
diff --git a/kallithea/templates/admin/gists/edit.html b/kallithea/templates/admin/gists/edit.html --- a/kallithea/templates/admin/gists/edit.html +++ b/kallithea/templates/admin/gists/edit.html @@ -28,7 +28,7 @@ ${self.breadcrumbs()}
-
+
-
+
${h.form(h.url('gists'), method='post',id='eform')}
diff --git a/kallithea/templates/admin/gists/show.html b/kallithea/templates/admin/gists/show.html --- a/kallithea/templates/admin/gists/show.html +++ b/kallithea/templates/admin/gists/show.html @@ -26,7 +26,7 @@
%endif
-
+
diff --git a/kallithea/templates/admin/my_account/my_account_repos.html b/kallithea/templates/admin/my_account/my_account_repos.html --- a/kallithea/templates/admin/my_account/my_account_repos.html +++ b/kallithea/templates/admin/my_account/my_account_repos.html @@ -1,6 +1,6 @@

${_('Repositories You Own')}

-
+
diff --git a/kallithea/templates/admin/my_account/my_account_watched.html b/kallithea/templates/admin/my_account/my_account_watched.html --- a/kallithea/templates/admin/my_account/my_account_watched.html +++ b/kallithea/templates/admin/my_account/my_account_watched.html @@ -1,6 +1,6 @@

${_('Repositories You are Watching')}

-
+
diff --git a/kallithea/templates/admin/notifications/notifications_data.html b/kallithea/templates/admin/notifications/notifications_data.html --- a/kallithea/templates/admin/notifications/notifications_data.html +++ b/kallithea/templates/admin/notifications/notifications_data.html @@ -31,5 +31,5 @@ unread = lambda n:{False:'unread'}.get(n %else: -
${_('No notifications here yet')}
+
${_('No notifications here yet')}
%endif diff --git a/kallithea/templates/admin/notifications/show_notification.html b/kallithea/templates/admin/notifications/show_notification.html --- a/kallithea/templates/admin/notifications/show_notification.html +++ b/kallithea/templates/admin/notifications/show_notification.html @@ -20,7 +20,7 @@
${self.breadcrumbs()}
-
+
${h.gravatar_div(c.notification.created_by_user.email, size=24)} diff --git a/kallithea/templates/admin/repo_groups/repo_groups.html b/kallithea/templates/admin/repo_groups/repo_groups.html --- a/kallithea/templates/admin/repo_groups/repo_groups.html +++ b/kallithea/templates/admin/repo_groups/repo_groups.html @@ -26,7 +26,7 @@ %endif
-
+
diff --git a/kallithea/templates/admin/repos/repos.html b/kallithea/templates/admin/repos/repos.html --- a/kallithea/templates/admin/repos/repos.html +++ b/kallithea/templates/admin/repos/repos.html @@ -24,7 +24,7 @@ %endif
-
+
diff --git a/kallithea/templates/admin/user_groups/user_groups.html b/kallithea/templates/admin/user_groups/user_groups.html --- a/kallithea/templates/admin/user_groups/user_groups.html +++ b/kallithea/templates/admin/user_groups/user_groups.html @@ -25,7 +25,7 @@ %endif
-
+
diff --git a/kallithea/templates/admin/users/users.html b/kallithea/templates/admin/users/users.html --- a/kallithea/templates/admin/users/users.html +++ b/kallithea/templates/admin/users/users.html @@ -23,7 +23,7 @@ ${_('Add User')}
-
+
diff --git a/kallithea/templates/base/perms_summary.html b/kallithea/templates/base/perms_summary.html --- a/kallithea/templates/base/perms_summary.html +++ b/kallithea/templates/base/perms_summary.html @@ -4,7 +4,7 @@ ## ${p.perms_summary(c.perm_user.permissions)} <%def name="perms_summary(permissions, show_all=False, actions=True)"> -
+
%for section in sorted(permissions.keys()):

${section.replace("_"," ").capitalize()}

diff --git a/kallithea/templates/changelog/changelog.html b/kallithea/templates/changelog/changelog.html --- a/kallithea/templates/changelog/changelog.html +++ b/kallithea/templates/changelog/changelog.html @@ -31,7 +31,7 @@ ${self.repo_context_bar('changelog', c.f
${self.breadcrumbs()}
-
+
%if c.pagination:
diff --git a/kallithea/templates/changeset/changeset.html b/kallithea/templates/changeset/changeset.html --- a/kallithea/templates/changeset/changeset.html +++ b/kallithea/templates/changeset/changeset.html @@ -19,16 +19,16 @@ <%def name="main()"> ${self.repo_context_bar('changelog', c.changeset.raw_id)}
-
- ${self.breadcrumbs()} -
- -
+ +
+
diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html --- a/kallithea/templates/changeset/changeset_range.html +++ b/kallithea/templates/changeset/changeset_range.html @@ -22,7 +22,7 @@ ${self.repo_context_bar('changelog')}
${self.breadcrumbs()}
-
+
diff --git a/kallithea/templates/compare/compare_diff.html b/kallithea/templates/compare/compare_diff.html --- a/kallithea/templates/compare/compare_diff.html +++ b/kallithea/templates/compare/compare_diff.html @@ -23,7 +23,7 @@ ${self.repo_context_bar('changelog')}
${self.breadcrumbs()}
-
+
## divs are "inline-block" and cannot have whitespace between them. diff --git a/kallithea/templates/errors/error_document.html b/kallithea/templates/errors/error_document.html --- a/kallithea/templates/errors/error_document.html +++ b/kallithea/templates/errors/error_document.html @@ -32,8 +32,7 @@ <%include file="/base/flash_msg.html"/> -
-
+

${c.site_name}

${c.error_message}

@@ -41,7 +40,6 @@

${c.error_explanation}

-
diff --git a/kallithea/templates/files/files.html b/kallithea/templates/files/files.html --- a/kallithea/templates/files/files.html +++ b/kallithea/templates/files/files.html @@ -29,7 +29,7 @@ ${self.repo_context_bar('files', c.revis ${_("Branch filter:")} ${h.select('branch_selector',c.changeset.raw_id,c.revision_options)}
-
+
<%include file='files_ypjax.html'/>
diff --git a/kallithea/templates/files/files_add.html b/kallithea/templates/files/files_add.html --- a/kallithea/templates/files/files_add.html +++ b/kallithea/templates/files/files_add.html @@ -32,7 +32,7 @@ ${self.repo_context_bar('files')} ${_('Branch')}: ${c.cs.branch}
-
+
${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data", class_="form-horizontal form-inline")}

diff --git a/kallithea/templates/files/files_delete.html b/kallithea/templates/files/files_delete.html --- a/kallithea/templates/files/files_delete.html +++ b/kallithea/templates/files/files_delete.html @@ -23,7 +23,7 @@ ${self.repo_context_bar('files')} ${_('Branch')}: ${c.cs.branch}

-
+
${h.form(h.url.current(),method='post',class_="form-horizontal")}

diff --git a/kallithea/templates/files/files_edit.html b/kallithea/templates/files/files_edit.html --- a/kallithea/templates/files/files_edit.html +++ b/kallithea/templates/files/files_edit.html @@ -32,7 +32,7 @@ ${self.repo_context_bar('files')} ${_('Branch')}: ${c.cs.branch}

-
+

${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.file.path)}

${h.form(h.url.current(),method='post',id='eform',class_='form-inline')} diff --git a/kallithea/templates/followers/followers.html b/kallithea/templates/followers/followers.html --- a/kallithea/templates/followers/followers.html +++ b/kallithea/templates/followers/followers.html @@ -19,7 +19,7 @@ ${self.repo_context_bar('followers')}
${self.breadcrumbs()}
-
+
<%include file='followers_data.html'/>
diff --git a/kallithea/templates/forks/forks.html b/kallithea/templates/forks/forks.html --- a/kallithea/templates/forks/forks.html +++ b/kallithea/templates/forks/forks.html @@ -19,7 +19,7 @@ ${self.repo_context_bar('showforks')}
${self.breadcrumbs()}
-
+
<%include file='forks_data.html'/>
diff --git a/kallithea/templates/index_base.html b/kallithea/templates/index_base.html --- a/kallithea/templates/index_base.html +++ b/kallithea/templates/index_base.html @@ -42,7 +42,7 @@ %endif
%if c.groups: -
+
@@ -74,7 +74,7 @@ %endif -
+
diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -285,7 +285,7 @@ ${self.repo_context_bar('showpullrequest
${_('Pull Request Content')}
-
+
${comment.comment_count(c.inline_cnt, len(c.comments))} diff --git a/kallithea/templates/search/search_commit.html b/kallithea/templates/search/search_commit.html --- a/kallithea/templates/search/search_commit.html +++ b/kallithea/templates/search/search_commit.html @@ -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'): -
${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['raw_id'])), @@ -25,14 +24,11 @@ %endif
-
%else: %if cnt == 0: -
${_('Permission denied')}
-
%endif %endif %endfor diff --git a/kallithea/templates/search/search_content.html b/kallithea/templates/search/search_content.html --- a/kallithea/templates/search/search_content.html +++ b/kallithea/templates/search/search_content.html @@ -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'): -
${h.link_to(h.literal('%s » %s' % (sr['repository'],sr['f_path'])), @@ -13,10 +12,9 @@ 
${h.literal(sr['content_short_hl'])}
-
%else: %if cnt == 0: -
+
${_('Permission denied')}
diff --git a/kallithea/templates/summary/summary.html b/kallithea/templates/summary/summary.html --- a/kallithea/templates/summary/summary.html +++ b/kallithea/templates/summary/summary.html @@ -179,7 +179,7 @@ summary = lambda n:{False:'summary-short %endif
-
+
<%include file='../changelog/changelog_summary_data.html'/>
diff --git a/kallithea/tests/functional/test_admin_notifications.py b/kallithea/tests/functional/test_admin_notifications.py --- a/kallithea/tests/functional/test_admin_notifications.py +++ b/kallithea/tests/functional/test_admin_notifications.py @@ -23,7 +23,7 @@ class TestNotificationsController(TestCo Session().commit() response = self.app.get(url('notifications')) - response.mustcontain('
No notifications here yet
') + response.mustcontain('
No notifications here yet
') with test_context(self.app): cur_user = self._get_logged_user()