Mercurial > kallithea
changeset 6398:97b8db701355
templates: replace invalid metatag attributes with data attributes
(We could also use plain classes ... but stick to the plan ...)
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Fri, 06 Jan 2017 01:43:50 +0100 |
| parents | 3509e025b2e5 |
| children | 782db8fc95ea |
| files | kallithea/lib/helpers.py kallithea/public/css/style.css kallithea/templates/admin/settings/settings_visual.html kallithea/tests/other/test_libs.py |
| diffstat | 4 files changed, 28 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/helpers.py Fri Jan 06 01:43:50 2017 +0100 +++ b/kallithea/lib/helpers.py Fri Jan 06 01:43:50 2017 +0100 @@ -1020,20 +1020,20 @@ if stylize: seen = match_obj.group('seen') if seen: - return '<div class="metatag" tag="see">see => %s</div>' % seen + return '<div class="metatag" data-tag="see">see => %s</div>' % seen license = match_obj.group('license') if license: - return '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/%s">%s</a></div>' % (license, license) + return '<div class="metatag" data-tag="license"><a href="http:\/\/www.opensource.org/licenses/%s">%s</a></div>' % (license, license) tagtype = match_obj.group('tagtype') if tagtype: tagvalue = match_obj.group('tagvalue') - return '<div class="metatag" tag="%s">%s => <a href="/%s">%s</a></div>' % (tagtype, tagtype, tagvalue, tagvalue) + return '<div class="metatag" data-tag="%s">%s => <a href="/%s">%s</a></div>' % (tagtype, tagtype, tagvalue, tagvalue) lang = match_obj.group('lang') if lang: - return '<div class="metatag" tag="lang">%s</div>' % lang + return '<div class="metatag" data-tag="lang">%s</div>' % lang tag = match_obj.group('tag') if tag: - return '<div class="metatag" tag="%s">%s</div>' % (tag, tag) + return '<div class="metatag" data-tag="%s">%s</div>' % (tag, tag) return match_obj.group(0) def _urlify(s):
--- a/kallithea/public/css/style.css Fri Jan 06 01:43:50 2017 +0100 +++ b/kallithea/public/css/style.css Fri Jan 06 01:43:50 2017 +0100 @@ -1238,40 +1238,40 @@ background-color: #DEF; } -.metatag[tag="dead"] { +.metatag[data-tag="dead"] { background-color: #E44; } -.metatag[tag="stale"] { +.metatag[data-tag="stale"] { background-color: #EA4; } -.metatag[tag="featured"] { +.metatag[data-tag="featured"] { background-color: #AEA; } -.metatag[tag="requires"] { +.metatag[data-tag="requires"] { background-color: #9CF; } -.metatag[tag="recommends"] { +.metatag[data-tag="recommends"] { background-color: #BDF; } -.metatag[tag="lang"] { +.metatag[data-tag="lang"] { background-color: #FAF474; } -.metatag[tag="license"] { +.metatag[data-tag="license"] { border: solid 1px #9CF; background-color: #DEF; } -.metatag[tag="see"] { +.metatag[data-tag="see"] { border: solid 1px #CBD; background-color: #EDF; } -a.metatag[tag="license"]:hover { +a.metatag[data-tag="license"]:hover { background-color: #577632; color: #FFF; text-decoration: none;
--- a/kallithea/templates/admin/settings/settings_visual.html Fri Jan 06 01:43:50 2017 +0100 +++ b/kallithea/templates/admin/settings/settings_visual.html Fri Jan 06 01:43:50 2017 +0100 @@ -98,14 +98,14 @@ <div> ${_('Stylify recognised meta tags:')} <ul> <!-- Fix style here --> - <li>[featured] <span class="metatag" tag="featured">featured</span></li> - <li>[stale] <span class="metatag" tag="stale">stale</span></li> - <li>[dead] <span class="metatag" tag="dead">dead</span></li> - <li>[lang => lang] <span class="metatag" tag="lang" >lang</span></li> - <li>[license => License] <span class="metatag" tag="license"><a href="http://www.opensource.org/licenses/License" >License</a></span></li> - <li>[requires => Repo] <span class="metatag" tag="requires" >requires => <a href="#" >Repo</a></span></li> - <li>[recommends => Repo] <span class="metatag" tag="recommends" >recommends => <a href="#" >Repo</a></span></li> - <li>[see => URI] <span class="metatag" tag="see">see => <a href="#">URI</a> </span></li> + <li>[featured] <span class="metatag" data-tag="featured">featured</span></li> + <li>[stale] <span class="metatag" data-tag="stale">stale</span></li> + <li>[dead] <span class="metatag" data-tag="dead">dead</span></li> + <li>[lang => lang] <span class="metatag" data-tag="lang">lang</span></li> + <li>[license => License] <span class="metatag" data-tag="license"><a href="http://www.opensource.org/licenses/License">License</a></span></li> + <li>[requires => Repo] <span class="metatag" data-tag="requires">requires => <a href="#">Repo</a></span></li> + <li>[recommends => Repo] <span class="metatag" data-tag="recommends">recommends => <a href="#">Repo</a></span></li> + <li>[see => URI] <span class="metatag" data-tag="see">see => <a href="#">URI</a> </span></li> </ul> </div> </div>
--- a/kallithea/tests/other/test_libs.py Fri Jan 06 01:43:50 2017 +0100 +++ b/kallithea/tests/other/test_libs.py Fri Jan 06 01:43:50 2017 +0100 @@ -213,12 +213,12 @@ ) from kallithea.lib.helpers import urlify_text res = urlify_text(sample, stylize=True) - assert '<div class="metatag" tag="tag">tag</div>' in res - assert '<div class="metatag" tag="obsolete">obsolete</div>' in res - assert '<div class="metatag" tag="stale">stale</div>' in res - assert '<div class="metatag" tag="lang">python</div>' in res - assert '<div class="metatag" tag="requires">requires => <a href="/url">url</a></div>' in res - assert '<div class="metatag" tag="tag">tag</div>' in res + assert '<div class="metatag" data-tag="tag">tag</div>' in res + assert '<div class="metatag" data-tag="obsolete">obsolete</div>' in res + assert '<div class="metatag" data-tag="stale">stale</div>' in res + assert '<div class="metatag" data-tag="lang">python</div>' in res + assert '<div class="metatag" data-tag="requires">requires => <a href="/url">url</a></div>' in res + assert '<div class="metatag" data-tag="tag">tag</div>' in res def test_alternative_gravatar(self): from kallithea.lib.helpers import gravatar_url