kallithea Changeset - fd3557b09f01

Changeset - fd3557b09f01

Parent rev.

Child rev.

[Not reviewed]

Merge beta

0 6 0

Marcin Kuzminski - 15 years ago 2011-01-28 12:19:20
marcin@python-works.com

merge

6 files changed with 88 insertions and 6 deletions:

development.ini

rhodecode/lib/db_manage.py

rhodecode/lib/helpers.py

rhodecode/public/css/pygments.css

rhodecode/templates/files/files_source.html

test.ini

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

@@ @@ -137,7 +137,8 @@ logview.pylons.util = #eee @@
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
 sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db
 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db
 sqlalchemy.db1.url = postgresql://postgres:qwe@localhost/rhodecode
 #sqlalchemy.db1.echo = False
 #sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.convert_unicode = true

rhodecode/lib/db_manage.py

➞

Show inline comments

@@ @@ -69,12 +69,17 @@ class DbManage(object): @@
                 self.db_exists = True
                 if not override:
                     raise Exception('database already exists')
             return 'sqlite'
         if self.dburi.startswith('postgresql'):
             self.db_exists = True
             return 'postgresql'
     def create_tables(self, override=False):
         """Create a auth database
         """
         self.check_for_db(override)
+        db_type = self.check_for_db(override)
         if self.db_exists:
             log.info("database exist and it's going to be destroyed")
             if self.tests:
@@ @@ -84,7 +89,11 @@ class DbManage(object): @@
             if not destroy:
                 sys.exit()
             if self.db_exists and destroy:
                 os.remove(jn(self.root, self.dbname))
                 if db_type == 'sqlite':
                     os.remove(jn(self.root, self.dbname))
                 if db_type == 'postgresql':
                     meta.Base.metadata.drop_all()
         checkfirst = not override
         meta.Base.metadata.create_all(checkfirst=checkfirst)
         log.info('Created tables for %s', self.dbname)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -5,6 +5,7 @@ available to Controllers. This module is @@
 """
 import random
 import hashlib
 import StringIO
 from pygments.formatters import HtmlFormatter
 from pygments import highlight as code_highlight
 from pylons import url, app_globals as g
@@ @@ -217,6 +218,8 @@ class _FilesBreadCrumbs(object): @@
 files_breadcrumbs = _FilesBreadCrumbs()
 class CodeHtmlFormatter(HtmlFormatter):
     """My code Html Formatter for source codes
     """
     def wrap(self, source, outfile):
         return self._wrap_div(self._wrap_pre(self._wrap_code(source)))
@@ @@ -224,8 +227,72 @@ class CodeHtmlFormatter(HtmlFormatter): @@
     def _wrap_code(self, source):
         for cnt, it in enumerate(source):
             i, t = it
-            t = '<div id="#S-%s">%s</div>' % (cnt + 1, t)
+            t = '<div id="L%s">%s</div>' % (cnt + 1, t)
             yield i, t
     def _wrap_tablelinenos(self, inner):
         dummyoutfile = StringIO.StringIO()
         lncount = 0
         for t, line in inner:
             if t:
                 lncount += 1
             dummyoutfile.write(line)
         fl = self.linenostart
         mw = len(str(lncount + fl - 1))
         sp = self.linenospecial
         st = self.linenostep
         la = self.lineanchors
         aln = self.anchorlinenos
         nocls = self.noclasses
         if sp:
             lines = []
             for i in range(fl, fl + lncount):
                 if i % st == 0:
                     if i % sp == 0:
                         if aln:
                             lines.append('<a href="#%s%d" class="special">%*d</a>' %
                                          (la, i, mw, i))
                         else:
                             lines.append('<span class="special">%*d</span>' % (mw, i))
                     else:
                         if aln:
                             lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i))
                         else:
                             lines.append('%*d' % (mw, i))
                 else:
                     lines.append('')
             ls = '\n'.join(lines)
         else:
             lines = []
             for i in range(fl, fl + lncount):
                 if i % st == 0:
                     if aln:
                         lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i))
                     else:
                         lines.append('%*d' % (mw, i))
                 else:
                     lines.append('')
             ls = '\n'.join(lines)
         # in case you wonder about the seemingly redundant <div> here: since the
         # content in the other cell also is wrapped in a div, some browsers in
         # some configurations seem to mess up the formatting...
         if nocls:
             yield 0, ('<table class="%stable">' % self.cssclass +
                       '<tr><td><div class="linenodiv" '
                       'style="background-color: #f0f0f0; padding-right: 10px">'
                       '<pre style="line-height: 125%">' +
                       ls + '</pre></div></td><td class="code">')
         else:
             yield 0, ('<table class="%stable">' % self.cssclass +
                       '<tr><td class="linenos"><div class="linenodiv"><pre>' +
                       ls + '</pre></div></td><td class="code">')
         yield 0, dummyoutfile.getvalue()
         yield 0, '</td></tr></table>'
 def pygmentize(filenode, **kwargs):
     """pygmentize function using pygments

rhodecode/public/css/pygments.css

➞

Show inline comments

@@ @@ -53,6 +53,10 @@ div.annotatediv{ @@
 	padding: 5px;
     margin: 0;
+}
 .code-highlight pre div:target {
     background-color: #FFFFBE !important;
+}
 .linenos a { text-decoration: none; }
 .code { display: block; }

rhodecode/templates/files/files_source.html

➞

Show inline comments

@@ @@ -37,7 +37,7 @@ @@
 	</div>
 	<div class="code-body">
 		% if c.files_list.size < c.cut_off_limit:
-			${h.pygmentize(c.files_list,linenos=True,anchorlinenos=True,lineanchors='S',cssclass="code-highlight")}
+			${h.pygmentize(c.files_list,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
 		%else:
 			${_('File is to big to display')} ${h.link_to(_('show as raw'),
 			h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}

test.ini

➞

Show inline comments

@@ @@ -137,7 +137,8 @@ logview.pylons.util = #eee @@
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
 sqlalchemy.db1.url = sqlite:///%(here)s/test.db
 #sqlalchemy.db1.url = sqlite:///%(here)s/test.db
 sqlalchemy.db1.url = postgresql://postgres:qwe@localhost/rhodecode_tests
 #sqlalchemy.db1.echo = False
 #sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.convert_unicode = true

0 comments (0 inline, 0 general)