kallithea Changeset - f1acd7c28157

Changeset - f1acd7c28157

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

domruf - 8 years ago 2017-10-13 20:44:01
dominikruf@gmail.com

changelog: add more verbose titles to [HG] and [GIT] repotags

3 files changed with 13 insertions and 7 deletions:

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

@@ @@ -424,28 +424,28 @@ @@
             var cache = {}
             /*format the look of items in the list*/
             var format = function(state){
                 if (!state.id){
                   return state.text; // optgroup
+                }
                 var obj_dict = state.obj;
                 var tmpl = '';
                 if(obj_dict && state.type == 'repo'){
                     tmpl += '<span class="repo-icons">';
                     if(obj_dict['repo_type'] === 'hg'){
                         tmpl += '<span class="repotag">hg</span> ';
+                        tmpl += '<span class="repotag" title="${_('Mercurial repository')}">hg</span> ';
+                    }
                     else if(obj_dict['repo_type'] === 'git'){
                         tmpl += '<span class="repotag">git</span> ';
+                        tmpl += '<span class="repotag" title="${_('Git repository')}">git</span> ';
+                    }
                     if(obj_dict['private']){
                         tmpl += '<i class="icon-keyhole-circled"></i> ';
+                    }
                     else if(visual_show_public_icon){
                         tmpl += '<i class="icon-globe"></i> ';
+                    }
                     tmpl += '</span>';
+                }
                 if(obj_dict && state.type == 'group'){
                         tmpl += '<i class="icon-folder"></i> ';
+                }

kallithea/tests/functional/test_home.py

➞

Show inline comments

@@ @@ -8,25 +8,31 @@ from kallithea.model.repo_group import R @@
 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')
         response.mustcontain('<span class="repotag">git')
         response.mustcontain(
             """<span class="repotag" title="Git repository">git"""
+        )
         response.mustcontain(
             """<span class="repotag" title="Mercurial repository">hg"""
+        )
         # html in javascript variable:
         response.mustcontain(r'href=\"/%s\"' % HG_REPO)
         response.mustcontain(r'\x3ci class=\"icon-globe\"')
         response.mustcontain(r'\"fixes issue with having custom format for git-log\n\"')
         response.mustcontain(r'\"/%s/changeset/5f2c6ee195929b0be80749243c18121c9864a3b3\"' % GIT_REPO)
         response.mustcontain(r'\"disable security checks on hg clone for travis\"')
         response.mustcontain(r'\"/%s/changeset/96507bd11ecc815ebc6270fdf6db110928c09c1e\"' % HG_REPO)

kallithea/tests/functional/test_summary.py

➞

Show inline comments

@@ @@ -24,25 +24,25 @@ fixture = Fixture() @@
 class TestSummaryController(TestController):
     def test_index_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=HG_REPO))
         # repo type
         response.mustcontain(
             """<span class="repotag">hg"""
+            """<span class="repotag" title="Mercurial repository">hg"""
+        )
         # public/private
         response.mustcontain(
             """<i class="icon-globe">"""
+        )
         # clone url...
         response.mustcontain(
             '''<input class="form-control" size="80" readonly="readonly" value="http://%s@localhost:80/%s"/>''' %
             (TEST_USER_ADMIN_LOGIN, HG_REPO)
+        )
         response.mustcontain(
@@ @@ -50,50 +50,50 @@ class TestSummaryController(TestControll @@
             (TEST_USER_ADMIN_LOGIN, 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(
             """<span class="repotag">git"""
+            """<span class="repotag" title="Git repository">git"""
+        )
         # public/private
         response.mustcontain(
             """<i class="icon-globe">"""
+        )
         # clone url...
         response.mustcontain(
             '''<input class="form-control" size="80" readonly="readonly" value="http://%s@localhost:80/%s"/>''' %
             (TEST_USER_ADMIN_LOGIN, GIT_REPO))
         response.mustcontain(
             '''<input class="form-control" size="80" readonly="readonly" value="http://%s@localhost:80/_%s"/>''' %
             (TEST_USER_ADMIN_LOGIN, 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(
             """<span class="repotag">hg"""
+            """<span class="repotag" title="Mercurial repository">hg"""
+        )
         # public/private
         response.mustcontain(
             """<i class="icon-globe">"""
+        )
     def test_index_by_repo_having_id_path_in_name_hg(self):
         self.log_user()
         fixture.create_repo(name=u'repo_1')
         response = self.app.get(url(controller='summary',
                                     action='index',
                                     repo_name='repo_1'))
@@ @@ -104,25 +104,25 @@ class TestSummaryController(TestControll @@
             RepoModel().delete(Repository.get_by_repo_name(u'repo_1'))
             Session().commit()
     def test_index_by_id_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='_%s' % ID))
         # repo type
         response.mustcontain(
             """<span class="repotag">git"""
+            """<span class="repotag" title="Git repository">git"""
+        )
         # public/private
         response.mustcontain(
             """<i class="icon-globe">"""
+        )
     def _enable_stats(self, repo):
         r = Repository.get_by_repo_name(repo)
         r.enable_statistics = True
         Session().commit()
     def test_index_trending(self):

0 comments (0 inline, 0 general)