# HG changeset patch # User Sean Farley # Date 2014-09-02 15:56:00 # Node ID 27504cac41271ea12358ce169d71d9f65e580c04 # Parent f14497d6305e005f06f8a811c4790aade6670c93 lock_open.png: replace icon-unlock-* with icon-lock-open-alt The inline 'style' override has been modified to only leave spacing and sizing (removing color). diff --git a/kallithea/public/css/contextbar.css b/kallithea/public/css/contextbar.css --- a/kallithea/public/css/contextbar.css +++ b/kallithea/public/css/contextbar.css @@ -18,7 +18,6 @@ i.icon-lock-alt { background-image: url( i.icon-private { background-image: url('../images/icons/private_repo.png');} i.icon-refresh { background-image: url('../images/icons/arrow_refresh.png');} i.icon-tag { background-image: url("../images/icons/tag_blue.png"); } -i.icon-unlock { background-image: url('../images/icons/lock_open.png');} i.icon-plus-sign { background-image: url('../images/icons/add.png');} i.icon-chevron-left:after { content: "\00AB";} i.icon-chevron-right:after { content: "\00BB";} diff --git a/kallithea/public/images/icons/lock_open.png b/kallithea/public/images/icons/lock_open.png deleted file mode 100644 index f93c6922308568fe16579b81886908acff590e7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@ - + ${_('Unlock Repository')} ${'Locked by %s on %s' % (h.person_by_id(c.repo_info.locked[0]),h.fmt_date(h.time_to_datetime(c.repo_info.locked[1])))} diff --git a/kallithea/templates/admin/settings/settings_vcs.html b/kallithea/templates/admin/settings/settings_vcs.html --- a/kallithea/templates/admin/settings/settings_vcs.html +++ b/kallithea/templates/admin/settings/settings_vcs.html @@ -88,7 +88,7 @@ ${h.form(url('admin_settings'), method=' $(document).ready(function(){ $('#path_unlock').on('click', function(e){ $('#path_unlock_icon').removeClass('icon-lock'); - $('#path_unlock_icon').addClass('icon-unlock'); + $('#path_unlock_icon').addClass('icon-lock-open-alt'); $('#paths_root_path').removeAttr('readonly'); $('#paths_root_path').removeClass('disabled'); }) diff --git a/kallithea/templates/base/base.html b/kallithea/templates/base/base.html --- a/kallithea/templates/base/base.html +++ b/kallithea/templates/base/base.html @@ -129,7 +129,7 @@ %if c.db_repo.private: %else: - + %endif ${h.repo_link(c.db_repo.groups_and_repo)} @@ -388,7 +388,7 @@ tmpl += ' '; } else if(visual_show_public_icon){ - tmpl += ' '; + tmpl += ' '; } tmpl += ''; } diff --git a/kallithea/templates/data_table/_dt_elements.html b/kallithea/templates/data_table/_dt_elements.html --- a/kallithea/templates/data_table/_dt_elements.html +++ b/kallithea/templates/data_table/_dt_elements.html @@ -77,7 +77,7 @@ %if private and c.visual.show_private_icon: %elif not private and c.visual.show_public_icon: - + %else: %endif diff --git a/kallithea/tests/functional/test_home.py b/kallithea/tests/functional/test_home.py --- a/kallithea/tests/functional/test_home.py +++ b/kallithea/tests/functional/test_home.py @@ -21,7 +21,7 @@ class TestHomeController(TestController) response.mustcontain(r'href=\"/%s\"' % HG_REPO) response.mustcontain(r'""" + """""" ) # clone url... @@ -57,7 +57,7 @@ class TestSummaryController(TestControll ) #public/private response.mustcontain( - """""" + """""" ) # clone url... @@ -77,7 +77,7 @@ class TestSummaryController(TestControll ) #public/private response.mustcontain( - """""" + """""" ) def test_index_by_repo_having_id_path_in_name_hg(self): @@ -106,7 +106,7 @@ class TestSummaryController(TestControll ) #public/private response.mustcontain( - """""" + """""" ) def _enable_stats(self, repo):