Changeset - 961ef96fcc65
[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:
0 comments (0 inline, 0 general)
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-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
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-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:
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-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)
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-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)
 

	
 
@@ -54,13 +54,13 @@ class TestSummaryController(TestControll
 
        #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)
 

	
 
@@ -74,13 +74,13 @@ class TestSummaryController(TestControll
 
        #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',
 
@@ -103,13 +103,13 @@ class TestSummaryController(TestControll
 
        #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)
0 comments (0 inline, 0 general)