# HG changeset patch # User domruf # Date 1498771035 -7200 # Node ID 789de118156b0a561d667d6d8b437f88e3c996f9 # Parent 00905ed03136f74ad6dea57b3887d936cba4f8f6 style: consistently use 'changeset_hash' class for monospace hashes Get rid of 'revision-link' and some use of 'hash'. There is still some use of 'hash' for columns, but the content there already has 'changeset_hash'. diff -r 00905ed03136 -r 789de118156b kallithea/lib/helpers.py --- a/kallithea/lib/helpers.py Mon Aug 28 05:25:40 2017 +0200 +++ b/kallithea/lib/helpers.py Thu Jun 29 23:17:15 2017 +0200 @@ -1034,7 +1034,7 @@ hash_ = match_obj.group('hash') if hash_ is not None and repo_name is not None: from kallithea.config.routing import url # doh, we need to re-import url to mock it later - return '%(hash)s' % { + return '%(hash)s' % { 'url': url('changeset_home', repo_name=repo_name, revision=hash_), 'hash': hash_, } diff -r 00905ed03136 -r 789de118156b kallithea/public/css/style.css --- a/kallithea/public/css/style.css Mon Aug 28 05:25:40 2017 +0200 +++ b/kallithea/public/css/style.css Thu Jun 29 23:17:15 2017 +0200 @@ -1586,23 +1586,6 @@ margin-left: 40px !important; } -#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; - font-family: monospace; - font-size: 12px; - color: #577632; -} - -.revision-link { - color: #3F6F9F; - font-weight: bold !important; -} - .issue-tracker-link { color: #3F6F9F; font-weight: bold !important; @@ -2024,11 +2007,6 @@ font-size: 14px; } -.breadcrumbs .hash { - text-transform: none; - color: #fff; -} - div#legend_data { padding-left: 10px; } diff -r 00905ed03136 -r 789de118156b kallithea/templates/changeset/changeset.html --- a/kallithea/templates/changeset/changeset.html Mon Aug 28 05:25:40 2017 +0200 +++ b/kallithea/templates/changeset/changeset.html Thu Jun 29 23:17:15 2017 +0200 @@ -9,7 +9,7 @@ <%def name="breadcrumbs_links()"> - ${_('Changeset')} - ${h.show_id(c.changeset)} + ${_('Changeset')} - ${h.show_id(c.changeset)} <%block name="header_menu"> diff -r 00905ed03136 -r 789de118156b kallithea/templates/data_table/_dt_elements.html --- a/kallithea/templates/data_table/_dt_elements.html Mon Aug 28 05:25:40 2017 +0200 +++ b/kallithea/templates/data_table/_dt_elements.html Thu Jun 29 23:17:15 2017 +0200 @@ -40,7 +40,7 @@ <%def name="revision(name,rev,tip,author,last_msg)">
%if rev >= 0: - ${'r%s:%s' % (rev,h.short_id(tip))} + ${'r%s:%s' % (rev,h.short_id(tip))} %else: ${_('No changesets yet')} %endif diff -r 00905ed03136 -r 789de118156b kallithea/templates/files/files_browser.html --- a/kallithea/templates/files/files_browser.html Mon Aug 28 05:25:40 2017 +0200 +++ b/kallithea/templates/files/files_browser.html Thu Jun 29 23:17:15 2017 +0200 @@ -92,7 +92,7 @@ %if node.is_file(): - ${h.show_id(node.last_changeset)} + ${h.show_id(node.last_changeset)} %endif diff -r 00905ed03136 -r 789de118156b kallithea/tests/other/test_libs.py --- a/kallithea/tests/other/test_libs.py Mon Aug 28 05:25:40 2017 +0200 +++ b/kallithea/tests/other/test_libs.py Thu Jun 29 23:17:15 2017 +0200 @@ -287,7 +287,7 @@ repo_name=repo_name, repo_id=23, **overrides) assert clone_url == expected - def _quick_url(self, text, tmpl="""%s""", url_=None): + def _quick_url(self, text, tmpl="""%s""", url_=None): """ Changes `some text url[foo]` => `some text foo @@ -363,7 +363,7 @@ """@mention @someone""", ""), ("deadbeefcafe 123412341234", - """deadbeefcafe 123412341234""", + """deadbeefcafe 123412341234""", ""), ("We support * markup for *bold* markup of *single or multiple* words, " "*a bit @like http://slack.com*. " @@ -390,7 +390,7 @@ @parametrize('sample,expected', [ ("deadbeefcafe @mention, and http://foo.bar/ yo", - """deadbeefcafe""" + """deadbeefcafe""" """ @mention, and """ """http://foo.bar/""" """ yo"""),