engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

metatags: improve display syntax and add deprecated tag.

Browse source
This commit is contained in:
Marcin Kuzminski 2017-09-14 20:14:11 +02:00
parent 88d1b737e0
commit f59da891ad
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rhodecode/lib/helpers.py
View file

@ -933,7 +933,7 @@ tags_paterns = OrderedDict((
'<div class="metatag" tag="lang">\\2</div>')),
('see', (re.compile(r'\[see\ \=\&gt;\ *([a-zA-Z0-9\/\=\?\&amp;\ \:\/\.\-]*)\]'),
'<div class="metatag" tag="see">see =&gt; \\1 </div>')),
'<div class="metatag" tag="see">see: \\1 </div>')),
('url', (re.compile(r'\[url\ \=\&gt;\ \[([a-zA-Z0-9\ \.\-\_]+)\]\((.*?)\)\]'),
'<div class="metatag" tag="url"> <a href="\\2">\\1</a> </div>')),
@ -942,9 +942,9 @@ tags_paterns = OrderedDict((
'<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/\\1">\\1</a></div>')),
('ref', (re.compile(r'\[(requires|recommends|conflicts|base)\ \=\&gt;\ *([a-zA-Z0-9\-\/]*)\]'),
'<div class="metatag" tag="ref \\1">\\1 =&gt; <a href="/\\2">\\2</a></div>')),
'<div class="metatag" tag="ref \\1">\\1: <a href="/\\2">\\2</a></div>')),
('state', (re.compile(r'\[(stable|featured|stale|dead|dev)\]'),
('state', (re.compile(r'\[(stable|featured|stale|dead|dev|deprecated)\]'),
'<div class="metatag" tag="state \\1">\\1</div>')),
# label in grey

1
rhodecode/public/css/tags.less
View file

@ -84,6 +84,7 @@
[tag="ref requires"] { &:extend(.tag3); }
[tag="state dead"] { &:extend(.tag4); }
[tag="state deprecated"] { &:extend(.tag4); }
[tag="ref conflicts"] { &:extend(.tag4); }

1
rhodecode/templates/data_table/_dt_elements.mako
View file

@ -12,6 +12,7 @@
('state','[featured]'),
('state','[dev]'),
('state','[dead]'),
('state','[deprecated]'),
('label','[personal]'),
('generic','[v2.0.0]'),

10
rhodecode/tests/lib/test_libs.py
View file

@ -279,12 +279,12 @@ def test_metatag_extraction(sample, expected_tags):
(('license', '[license =&gt; MIT]'), '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/MIT">MIT</a></div>'),
(('license', '[license =&gt; AGPLv3]'), '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/AGPLv3">AGPLv3</a></div>'),
(('ref', '[requires =&gt; RepoName]'), '<div class="metatag" tag="ref requires">requires =&gt; <a href="/RepoName">RepoName</a></div>'),
(('ref', '[recommends =&gt; GroupName]'), '<div class="metatag" tag="ref recommends">recommends =&gt; <a href="/GroupName">GroupName</a></div>'),
(('ref', '[conflicts =&gt; SomeName]'), '<div class="metatag" tag="ref conflicts">conflicts =&gt; <a href="/SomeName">SomeName</a></div>'),
(('ref', '[base =&gt; SomeName]'), '<div class="metatag" tag="ref base">base =&gt; <a href="/SomeName">SomeName</a></div>'),
(('ref', '[requires =&gt; RepoName]'), '<div class="metatag" tag="ref requires">requires: <a href="/RepoName">RepoName</a></div>'),
(('ref', '[recommends =&gt; GroupName]'), '<div class="metatag" tag="ref recommends">recommends: <a href="/GroupName">GroupName</a></div>'),
(('ref', '[conflicts =&gt; SomeName]'), '<div class="metatag" tag="ref conflicts">conflicts: <a href="/SomeName">SomeName</a></div>'),
(('ref', '[base =&gt; SomeName]'), '<div class="metatag" tag="ref base">base: <a href="/SomeName">SomeName</a></div>'),
(('see', '[see =&gt; http://rhodecode.com]'), '<div class="metatag" tag="see">see =&gt; http://rhodecode.com </div>'),
(('see', '[see =&gt; http://rhodecode.com]'), '<div class="metatag" tag="see">see: http://rhodecode.com </div>'),
(('url', '[url =&gt; [linkName](https://rhodecode.com)]'), '<div class="metatag" tag="url"> <a href="https://rhodecode.com">linkName</a> </div>'),
(('url', '[url =&gt; [example link](https://rhodecode.com)]'), '<div class="metatag" tag="url"> <a href="https://rhodecode.com">example link</a> </div>'),