kallithea Changeset - 97b8db701355

Changeset - 97b8db701355

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich - 9 years ago 2017-01-06 01:43:50
mads@kiilerich.com

templates: replace invalid metatag attributes with data attributes

(We could also use plain classes ... but stick to the plan ...)

4 files changed with 28 insertions and 28 deletions:

kallithea/lib/helpers.py

kallithea/public/css/style.css

kallithea/templates/admin/settings/settings_visual.html

kallithea/tests/other/test_libs.py

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -1011,38 +1011,38 @@ def urlify_text(s, repo_name=None, link_ @@
         if hash_ is not None and repo_name is not None:
             from kallithea.config.routing import url  # doh, we need to re-import url to mock it later
             return '<a class="revision-link" href="%(url)s">%(hash)s</a>' % {
                  'url': url('changeset_home', repo_name=repo_name, revision=hash_),
                  'hash': hash_,
+                }
         bold = match_obj.group('bold')
         if bold is not None:
             return '<b>*%s*</b>' % _urlify(bold[1:-1])
         if stylize:
             seen = match_obj.group('seen')
             if seen:
                 return '<div class="metatag" tag="see">see =&gt; %s</div>' % seen
+                return '<div class="metatag" data-tag="see">see =&gt; %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 =&gt; <a href="/%s">%s</a></div>' % (tagtype, tagtype, tagvalue, tagvalue)
+                return '<div class="metatag" data-tag="%s">%s =&gt; <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):
         """
         Extract urls from text and make html links out of them
         """
         return _URLIFY_RE.sub(_replace, s)
     if truncate is None:
         s = s.rstrip()
     else:
         s = truncatef(s, truncate, whole_word=True)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -1229,58 +1229,58 @@ div.form div.form-horizontal div.form-gr @@
+}
 .metatag {
     display: inline-block;
     margin-right: 1px;
     border-radius: 4px 4px 4px 4px;
     border: solid 1px #9CF;
     padding: 2px 3px 2px 3px !important;
     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;
+}
 #summary .desc {
     white-space: pre;
     width: 100%;
+}
 #summary .repo_name {
     font-size: 1.6em;

kallithea/templates/admin/settings/settings_visual.html

➞

Show inline comments

@@ @@ -89,32 +89,32 @@ ${h.form(url('admin_settings_visual'), m @@
             </div>
             <div class="form-group">
                 <label class="control-label" for="stylify_metatags">${_('Meta Tagging')}:</label>
                 <div>
                     <div class="checkbox">
                         ${h.checkbox('stylify_metatags','True')}
                     </div>
                     <span class="help-block">${_('Parses meta tags from the repository description field and turns them into colored tags.')}</span>
                     <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 =&gt; lang] <span class="metatag" tag="lang" >lang</span></li>
                             <li>[license =&gt; License] <span class="metatag" tag="license"><a href="http://www.opensource.org/licenses/License" >License</a></span></li>
                             <li>[requires =&gt; Repo] <span class="metatag" tag="requires" >requires =&gt; <a href="#" >Repo</a></span></li>
                             <li>[recommends =&gt; Repo] <span class="metatag" tag="recommends" >recommends =&gt; <a href="#" >Repo</a></span></li>
                             <li>[see =&gt; URI] <span class="metatag" tag="see">see =&gt; <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 =&gt; lang] <span class="metatag" data-tag="lang">lang</span></li>
                             <li>[license =&gt; License] <span class="metatag" data-tag="license"><a href="http://www.opensource.org/licenses/License">License</a></span></li>
                             <li>[requires =&gt; Repo] <span class="metatag" data-tag="requires">requires =&gt; <a href="#">Repo</a></span></li>
                             <li>[recommends =&gt; Repo] <span class="metatag" data-tag="recommends">recommends =&gt; <a href="#">Repo</a></span></li>
                             <li>[see =&gt; URI] <span class="metatag" data-tag="see">see =&gt; <a href="#">URI</a> </span></li>
                         </ul>
                     </div>
                  </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>

kallithea/tests/other/test_libs.py

➞

Show inline comments

@@ @@ -204,30 +204,30 @@ class TestLibs(TestController): @@
             delt = lambda *args, **kwargs: relativedelta.relativedelta(*args, **kwargs)
             assert age(n + delt(**age_args), now=n) == expected
     def test_tag_extractor(self):
         sample = (
             "hello pta[tag] gog [[]] [[] sda ero[or]d [me =>>< sa]"
             "[requires] [stale] [see<>=>] [see => http://example.com]"
             "[requires => url] [lang => python] [just a tag]"
             "[,d] [ => ULR ] [obsolete] [desc]]"
+        )
         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 =&gt; <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 =&gt; <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
         _md5 = lambda s: hashlib.md5(s).hexdigest()
         #mock pylons.tmpl_context
         def fake_tmpl_context(_url):
             _c = AttributeDict()
             _c.visual = AttributeDict()
             _c.visual.use_gravatar = True
             _c.visual.gravatar_url = _url

0 comments (0 inline, 0 general)