diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py --- a/rhodecode/model/repo.py +++ b/rhodecode/model/repo.py @@ -254,9 +254,11 @@ class RepoModel(BaseModel): def desc(desc): if c.visual.stylify_metatags: - return h.urlify_text(h.escaped_stylize(h.truncate(desc, 60))) + desc = h.urlify_text(h.escaped_stylize(desc)) else: - return h.urlify_text(h.html_escape(h.truncate(desc, 60))) + desc = h.urlify_text(h.html_escape(desc)) + + return _render('repo_desc', desc) def state(repo_state): return _render("repo_state", repo_state) diff --git a/rhodecode/model/repo_group.py b/rhodecode/model/repo_group.py --- a/rhodecode/model/repo_group.py +++ b/rhodecode/model/repo_group.py @@ -48,7 +48,7 @@ log = logging.getLogger(__name__) class RepoGroupModel(BaseModel): cls = RepoGroup - PERSONAL_GROUP_DESC = '[personal] repo group: owner `%(username)s`' + PERSONAL_GROUP_DESC = 'personal repo group of user `%(username)s`' PERSONAL_GROUP_PATTERN = '${username}' # default def _get_user_group(self, users_group): @@ -656,11 +656,15 @@ class RepoGroupModel(BaseModel): def repo_group_lnk(repo_group_name): return _render('repo_group_name', repo_group_name) - def desc(desc): + def desc(desc, personal): + prefix = h.escaped_stylize(u'[personal] ') if personal else '' + if c.visual.stylify_metatags: - return h.urlify_text(h.escaped_stylize(h.truncate(desc, 60))) + desc = h.urlify_text(prefix + h.escaped_stylize(desc)) else: - return h.urlify_text(h.html_escape(h.truncate(desc, 60))) + desc = h.urlify_text(prefix + h.html_escape(desc)) + + return _render('repo_group_desc', desc) def repo_group_actions(repo_group_id, repo_group_name, gr_count): return _render( @@ -679,7 +683,7 @@ class RepoGroupModel(BaseModel): "menu": quick_menu(group.group_name), "name": repo_group_lnk(group.group_name), "name_raw": group.group_name, - "desc": desc(group.group_description), + "desc": desc(group.group_description, group.personal), "top_level_repos": 0, "owner": user_profile(group.user.username) } diff --git a/rhodecode/public/css/tables.less b/rhodecode/public/css/tables.less --- a/rhodecode/public/css/tables.less +++ b/rhodecode/public/css/tables.less @@ -129,6 +129,13 @@ table.dataTable { &.td-description { min-width: 350px; + + &.truncate, .truncate-wrap { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + max-width: 450px; + } } &.td-componentname { diff --git a/rhodecode/templates/data_table/_dt_elements.html b/rhodecode/templates/data_table/_dt_elements.html --- a/rhodecode/templates/data_table/_dt_elements.html +++ b/rhodecode/templates/data_table/_dt_elements.html @@ -72,6 +72,10 @@ +<%def name="repo_desc(description)"> +
${description}
+ + <%def name="last_change(last_change)"> ${h.age_component(last_change)} @@ -167,6 +171,10 @@ +<%def name="repo_group_desc(description)"> +
${description}
+ + <%def name="repo_group_actions(repo_group_id, repo_group_name, gr_count)">
Edit