# HG changeset patch # User Marcin Kuzminski # Date 2017-09-14 18:14:11 # Node ID a327c56bb6845016ac6acd8081855a184323c14d # Parent 270f562f29e902543c13ba2164377e8de1304e67 metatags: improve display syntax and add deprecated tag. diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -933,7 +933,7 @@ tags_paterns = OrderedDict(( '
\\2
')), ('see', (re.compile(r'\[see\ \=\>\ *([a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\]'), - '
see => \\1
')), + '
see: \\1
')), ('url', (re.compile(r'\[url\ \=\>\ \[([a-zA-Z0-9\ \.\-\_]+)\]\((.*?)\)\]'), '
\\1
')), @@ -942,9 +942,9 @@ tags_paterns = OrderedDict(( '
\\1
')), ('ref', (re.compile(r'\[(requires|recommends|conflicts|base)\ \=\>\ *([a-zA-Z0-9\-\/]*)\]'), - '
\\1 => \\2
')), + '
\\1: \\2
')), - ('state', (re.compile(r'\[(stable|featured|stale|dead|dev)\]'), + ('state', (re.compile(r'\[(stable|featured|stale|dead|dev|deprecated)\]'), '
\\1
')), # label in grey diff --git a/rhodecode/public/css/tags.less b/rhodecode/public/css/tags.less --- a/rhodecode/public/css/tags.less +++ b/rhodecode/public/css/tags.less @@ -84,6 +84,7 @@ [tag="ref requires"] { &:extend(.tag3); } [tag="state dead"] { &:extend(.tag4); } +[tag="state deprecated"] { &:extend(.tag4); } [tag="ref conflicts"] { &:extend(.tag4); } diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako --- a/rhodecode/templates/data_table/_dt_elements.mako +++ b/rhodecode/templates/data_table/_dt_elements.mako @@ -12,6 +12,7 @@ ('state','[featured]'), ('state','[dev]'), ('state','[dead]'), + ('state','[deprecated]'), ('label','[personal]'), ('generic','[v2.0.0]'), diff --git a/rhodecode/tests/lib/test_libs.py b/rhodecode/tests/lib/test_libs.py --- a/rhodecode/tests/lib/test_libs.py +++ b/rhodecode/tests/lib/test_libs.py @@ -279,12 +279,12 @@ def test_metatag_extraction(sample, expe (('license', '[license => MIT]'), '
MIT
'), (('license', '[license => AGPLv3]'), '
AGPLv3
'), - (('ref', '[requires => RepoName]'), '
requires => RepoName
'), - (('ref', '[recommends => GroupName]'), '
recommends => GroupName
'), - (('ref', '[conflicts => SomeName]'), '
conflicts => SomeName
'), - (('ref', '[base => SomeName]'), '
base => SomeName
'), + (('ref', '[requires => RepoName]'), '
requires: RepoName
'), + (('ref', '[recommends => GroupName]'), '
recommends: GroupName
'), + (('ref', '[conflicts => SomeName]'), '
conflicts: SomeName
'), + (('ref', '[base => SomeName]'), '
base: SomeName
'), - (('see', '[see => http://rhodecode.com]'), '
see => http://rhodecode.com
'), + (('see', '[see => http://rhodecode.com]'), '
see: http://rhodecode.com
'), (('url', '[url => [linkName](https://rhodecode.com)]'), '
linkName
'), (('url', '[url => [example link](https://rhodecode.com)]'), '
example link
'),