提交: 252cf5408438e1b4d53b63e88c832309595b2260 - allura (git)

allura

Commit MetaInfo

• 修订版: 252cf5408438e1b4d53b63e88c832309595b2260 (tree)
• 时间: 2012-05-11 04:33:32
• 作者: bolkimen <bolkimen@yaho...>
• Commiter: Yaroslav Luzin

Log Message

[#4115] ticket:21 add code line link and highlight

更改概述

• modified: Allura/allura/lib/app_globals.py
• modified: Allura/allura/lib/utils.py
• modified: Allura/allura/public/nf/css/forge/hilite.css
• modified: Allura/allura/templates/repo/file.html

差异

--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -75,7 +75,7 @@ class Globals(object):
         self.oid_store = M.OpenIdStore()
 
         # Setup pygments
-        self.pygments_formatter = pygments.formatters.HtmlFormatter(
+        self.pygments_formatter = utils.LineAnchorCodeHtmlFormatter(
             cssclass='codehilite',
             linenos='inline')
 

--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -20,6 +20,7 @@ from pylons import tmpl_context as c
 from paste.httpheaders import CACHE_CONTROL, EXPIRES
 from webhelpers.html import literal
 from webob import exc
+from pygments.formatters import HtmlFormatter
 
 from ew import jinja2_ew as ew
 from ming.utils import LazyProperty
@@ -393,3 +394,20 @@ def postmortem_hook(etype, value, tb): # pragma no cover
         sys.stderr.write('Entering post-mortem PDB shell\n')
         traceback.print_exception(etype, value, tb)
         pdb.post_mortem(tb)
+
+class LineAnchorCodeHtmlFormatter(HtmlFormatter):
+    def _wrap_pre(self, inner):
+        style = []
+        if self.prestyles:
+            style.append(self.prestyles)
+        if self.noclasses:
+            style.append('line-height: 125%')
+        style = '; '.join(style)
+
+        num = self.linenostart
+        yield 0, ('<pre' + (style and ' style="%s"' % style) + '>')
+        for tup in inner:
+            yield (tup[0], '<a class="linelink" href="#codeline_%s">'\
+                           '<div id="codeline_%s" class="code_block">%s</div></a>' % (num, num, tup[1]))
+            num += 1
+        yield 0, '</pre>'

--- a/Allura/allura/public/nf/css/forge/hilite.css
+++ b/Allura/allura/public/nf/css/forge/hilite.css
@@ -63,4 +63,8 @@
 .codehilite .il { color: #666666 } /* Literal.Number.Integer.Long */
 
 .codehilite pre { margin:0; }
+.codehilite div { margin:0; padding: 0; }
+.codehilite a.linelink { text-decoration: none; }
+.codehilite a.linelink .code_block { width:100%; }
+.codehilite a.linelink .code_block:hover { background-color: #ffff99; }
 .codehilite .lineno { background-color: #ebebeb; display:inline-block; padding:0 .5em; border-width: 0 1px 0 0; border-style: solid; border-color: #ddd; }

--- a/Allura/allura/templates/repo/file.html
+++ b/Allura/allura/templates/repo/file.html
@@ -18,6 +18,27 @@
 </a>
 {% endblock %}
 
+{% block extra_js %}
+{{ super() }}
+<script type="text/javascript">(function() {
+  var hash = window.location.hash.substring(1);
+  if (hash != '' && hash.substring(0, 9) == 'codeline_') {
+    $('#' + hash).css('background-color', '#ffff99');
+  }
+
+  $('.code_block').each(function(index, element) {
+    $(element).bind('click', function() {
+      var hash = window.location.hash.substring(1);
+      if (hash != '' && hash.substring(0, 9) == 'codeline_') {
+        $('#' + hash).css('background-color', 'transparent');
+      }
+      $(element).css('background-color', '#ffff99');
+    });
+  });
+}());
+</script>
+{% endblock %}
+
 {% block content %}
   {{ clone_info(c.app.repo) }}
   {% if prev %}