kallithea Changeset - 961ef96fcc65

Changeset - 961ef96fcc65

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Sean Farley - 11 years ago 2014-10-31 22:48:27
sean.michael.farley@gmail.com

icon-lock-open-alt: use icon-globe to signify public repo

Tests are also updated.

4 files changed with 7 insertions and 7 deletions:

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/templates/base/base.html

➞

Show inline comments

@@ @@ -120,25 +120,25 @@ @@
       <h2>
         %if h.is_hg(c.db_repo):
           <i class="icon-hg" style="color: #576622; font-size: 24px"></i>
         %endif
         %if h.is_git(c.db_repo):
           <i class="icon-git" style="color: #e85634; font-size: 24px"></i>
         %endif
         ## public/private
         %if c.db_repo.private:
           <i class="icon-lock"></i>
         %else:
-          <i class="icon-lock-open-alt"></i>
+          <i class="icon-globe"></i>
         %endif
         ${h.repo_link(c.db_repo.groups_and_repo)}
         %if current == 'createfork':
          - ${_('Create Fork')}
         %endif
       </h2>
       <!--
       <div id="breadcrumbs">
         ${h.link_to(_(u'Repositories'),h.url('home'))}
         &raquo;
         ${h.repo_link(c.db_repo.groups_and_repo)}

kallithea/templates/data_table/_dt_elements.html

➞

Show inline comments

@@ @@ -68,25 +68,25 @@ @@
     ##TYPE OF REPO
     %if h.is_hg(rtype):
         <span title="${_('Mercurial repository')}"><i class="icon-hg" style="color: #576622; font-size: 14px;"></i></span>
     %elif h.is_git(rtype):
         <span title="${_('Git repository')}"><i class="icon-git" style="color: #e85634; font-size: 14px;"></i></span>
     %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-lock-open-alt" title="${_('Public repository')}" style="font-size: 16px; vertical-align: -2px; margin: 0px 1px 0px 3px"></i>
+      <i class="icon-globe" 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:
       <a href="${h.url('summary_home',repo_name=fork_of.repo_name)}"><i class="icon-fork"></i></a>
     %endif
     %if rstate == 'repo_state_pending':
       <i class="icon-sliders" style="color: #036185;" title="${_('Repository creating in progress...')}"></i>
     %endif
   </div>

kallithea/tests/functional/test_home.py

➞

Show inline comments

@@ @@ -12,25 +12,25 @@ fixture = Fixture() @@
 class TestHomeController(TestController):
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='home', action='index'))
         #if global permission is set
         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-lock-open-alt\"')
+        response.mustcontain(r'<i class=\"icon-globe\"')
         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)
     def test_repo_summary_with_anonymous_access_disabled(self):
         with fixture.anon_access(False):
             response = self.app.get(url(controller='summary',
                                         action='index', repo_name=HG_REPO),
                                         status=302)

kallithea/tests/functional/test_summary.py

➞

Show inline comments

@@ @@ -28,65 +28,65 @@ class TestSummaryController(TestControll @@
         self.log_user()
         ID = Repository.get_by_repo_name(HG_REPO).repo_id
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name=HG_REPO))
         #repo type
         response.mustcontain(
             """<i class="icon-hg" """
+        )
         #public/private
         response.mustcontain(
-            """<i class="icon-lock-open-alt">"""
+            """<i class="icon-globe">"""
+        )
         # 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)
     def test_index_git(self):
         self.log_user()
         ID = Repository.get_by_repo_name(GIT_REPO).repo_id
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name=GIT_REPO))
         #repo type
         response.mustcontain(
             """<i class="icon-git" """
+        )
         #public/private
         response.mustcontain(
-            """<i class="icon-lock-open-alt">"""
+            """<i class="icon-globe">"""
+        )
         # 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)
     def test_index_by_id_hg(self):
         self.log_user()
         ID = Repository.get_by_repo_name(HG_REPO).repo_id
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name='_%s' % ID))
         #repo type
         response.mustcontain(
             """<i class="icon-hg" """
+        )
         #public/private
         response.mustcontain(
-            """<i class="icon-lock-open-alt">"""
+            """<i class="icon-globe">"""
+        )
     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',
                                     action='index',
                                     repo_name='repo_1'))
         try:
             response.mustcontain("repo_1")
         finally:
@@ @@ -97,25 +97,25 @@ class TestSummaryController(TestControll @@
         self.log_user()
         ID = Repository.get_by_repo_name(GIT_REPO).repo_id
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name='_%s' % ID))
         #repo type
         response.mustcontain(
             """<i class="icon-git" """
+        )
         #public/private
         response.mustcontain(
-            """<i class="icon-lock-open-alt">"""
+            """<i class="icon-globe">"""
+        )
     def _enable_stats(self, repo):
         r = Repository.get_by_repo_name(repo)
         r.enable_statistics = True
         Session().add(r)
         Session().commit()
     def test_index_trending(self):
         self.log_user()
         #codes stats
         self._enable_stats(HG_REPO)

0 comments (0 inline, 0 general)