kallithea Changeset - 27504cac4127

Changeset - 27504cac4127

Parent rev.

Child rev.

[Not reviewed]

default

1 7 0

Sean Farley - 11 years ago 2014-09-02 15:56:00
sean.michael.farley@gmail.com

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).

8 files changed with 10 insertions and 11 deletions:

kallithea/public/css/contextbar.css

kallithea/public/images/icons/lock_open.png

bin+del

kallithea/templates/admin/repos/repo_edit_advanced.html

kallithea/templates/admin/settings/settings_vcs.html

kallithea/templates/base/base.html

kallithea/templates/data_table/_dt_elements.html

kallithea/tests/functional/test_home.py

kallithea/tests/functional/test_summary.py

0 comments (0 inline, 0 general)

kallithea/public/css/contextbar.css

➞

Show inline comments

@@ @@ -15,13 +15,12 @@ i.icon-heart-empty { background-image: u @@
 i.icon-hg { background-image: url('../images/icons/hgicon.png');}
 i.icon-lock { background-image: url('../images/icons/lock.png');}
 i.icon-lock-alt { background-image: url('../images/icons/private_repo.png');}
 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";}
 i.icon-pencil { background-image: url('../images/icons/application_form_edit.png');}
 i.icon-remove { background-image: url('../images/icons/delete.png');}
 i.icon-remove-sign { background-image: url('../images/icons/delete.png');}

kallithea/public/images/icons/lock_open.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

kallithea/templates/admin/repos/repo_edit_advanced.html

➞

Show inline comments

@@ @@ -48,13 +48,13 @@ ${h.end_form()} @@
 ${h.form(url('edit_repo_advanced_locking', repo_name=c.repo_info.repo_name), method='put')}
 <div class="form">
       %if c.repo_info.locked[0]:
         ${h.hidden('set_unlock', '1')}
         <button class="btn btn-small" type="submit"
                 onclick="return confirm('${_('Confirm to unlock repository.')}');">
-            <i class="icon-unlock"></i>
+            <i class="icon-lock-open-alt"></i>
             ${_('Unlock Repository')}
         </button>
        ${'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])))}
       %else:
         ${h.hidden('set_lock', '1')}
         <button class="btn btn-small" type="submit"

kallithea/templates/admin/settings/settings_vcs.html

➞

Show inline comments

@@ @@ -85,12 +85,12 @@ ${h.form(url('admin_settings'), method=' @@
     ${h.end_form()}
     <script type="text/javascript">
         $(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');
             })
         })
     </script>

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -126,13 +126,13 @@ @@
         %endif
         ## public/private
         %if c.db_repo.private:
           <i class="icon-lock"></i>
         %else:
-          <i class="icon-unlock-alt"></i>
+          <i class="icon-lock-open-alt"></i>
         %endif
         ${h.repo_link(c.db_repo.groups_and_repo)}
         %if current == 'createfork':
          - ${_('Create Fork')}
         %endif
@@ @@ -385,13 +385,13 @@ @@
                     tmpl += '<i class="icon-git"></i> ';
+                }
                 if(obj_dict['private']){
                     tmpl += '<i class="icon-lock" style="color: #e85634;"></i> ';
+                }
                 else if(visual_show_public_icon){
-                    tmpl += '<i class="icon-unlock-alt"></i> ';
+                    tmpl += '<i class="icon-lock-open-alt"></i> ';
+                }
                 tmpl += '</span>';
+            }
             if(obj_dict && state.type == 'group'){
                     tmpl += '<i class="icon-folder"></i> ';
+            }

kallithea/templates/data_table/_dt_elements.html

➞

Show inline comments

@@ @@ -74,13 +74,13 @@ @@
     %endif
     ##PRIVATE/PUBLIC
     %if private and c.visual.show_private_icon:
       <i class="icon-lock" style="color: #e85634; font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px" title="${_('Private repository')}"></i>
     %elif not private and c.visual.show_public_icon:
-      <i class="icon-unlock-alt" style="color: #999999; font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px" title="${_('Public repository')}"></i>
+      <i class="icon-lock-open-alt" title="${_('Public repository')}" style="font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px"></i>
     %else:
       <span style="margin: 0px 8px 0px 8px"></span>
     %endif
     ${get_name(name)}
     </a>
     %if fork_of:

kallithea/tests/functional/test_home.py

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ class TestHomeController(TestController) @@
         response.mustcontain('Add Repository')
         # html in javascript variable:
         response.mustcontain('var data = {"totalRecords": %s' % len(Repository.getAll()))
         response.mustcontain(r'href=\"/%s\"' % HG_REPO)
         response.mustcontain(r'<i class=\"icon-git\"')
-        response.mustcontain(r'<i class=\"icon-unlock-alt\"')
+        response.mustcontain(r'<i class=\"icon-lock-open-alt\"')
         response.mustcontain("""fixes issue with having custom format for git-log""")
         response.mustcontain("""/%s/changeset/5f2c6ee195929b0be80749243c18121c9864a3b3""" % GIT_REPO)
         response.mustcontain("""disable security checks on hg clone for travis""")
         response.mustcontain("""/%s/changeset/96507bd11ecc815ebc6270fdf6db110928c09c1e""" % HG_REPO)

kallithea/tests/functional/test_summary.py

➞

Show inline comments

@@ @@ -34,13 +34,13 @@ class TestSummaryController(TestControll @@
         #repo type
         response.mustcontain(
             """<i class="icon-hg" """
+        )
         #public/private
         response.mustcontain(
-            """<i class="icon-unlock-alt">"""
+            """<i class="icon-lock-open-alt">"""
+        )
         # clone url...
         response.mustcontain('''id="clone_url" readonly="readonly" value="http://test_admin@localhost:80/%s"''' % HG_REPO)
         response.mustcontain('''id="clone_url_id" readonly="readonly" value="http://test_admin@localhost:80/_%s"''' % ID)
@@ @@ -54,13 +54,13 @@ class TestSummaryController(TestControll @@
         #repo type
         response.mustcontain(
             """<i class="icon-git" """
+        )
         #public/private
         response.mustcontain(
-            """<i class="icon-unlock-alt">"""
+            """<i class="icon-lock-open-alt">"""
+        )
         # clone url...
         response.mustcontain('''id="clone_url" readonly="readonly" value="http://test_admin@localhost:80/%s"''' % GIT_REPO)
         response.mustcontain('''id="clone_url_id" readonly="readonly" value="http://test_admin@localhost:80/_%s"''' % ID)
@@ @@ -74,13 +74,13 @@ class TestSummaryController(TestControll @@
         #repo type
         response.mustcontain(
             """<i class="icon-hg" """
+        )
         #public/private
         response.mustcontain(
-            """<i class="icon-unlock-alt">"""
+            """<i class="icon-lock-open-alt">"""
+        )
     def test_index_by_repo_having_id_path_in_name_hg(self):
         self.log_user()
         fixture.create_repo(name='repo_1')
         response = self.app.get(url(controller='summary',
@@ @@ -103,13 +103,13 @@ class TestSummaryController(TestControll @@
         #repo type
         response.mustcontain(
             """<i class="icon-git" """
+        )
         #public/private
         response.mustcontain(
-            """<i class="icon-unlock-alt">"""
+            """<i class="icon-lock-open-alt">"""
+        )
     def _enable_stats(self, repo):
         r = Repository.get_by_repo_name(repo)
         r.enable_statistics = True
         Session().add(r)

0 comments (0 inline, 0 general)