kallithea Changeset - fc8ab968fe10

Changeset - fc8ab968fe10

Parent rev.

Child rev.

[Not reviewed]

Merge default

! ! !

Weblate - 11 years ago 2015-01-05 10:58:24
noreply@weblate.org

Merge

19 files changed:

.tx/config

LICENSE.md

MANIFEST.in

kallithea/config/middleware.py

kallithea/controllers/changeset.py

kallithea/controllers/files.py

kallithea/i18n/how_to

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

kallithea/lib/diffs.py

kallithea/lib/helpers.py

kallithea/lib/markup_renderer.py

kallithea/model/db.py

kallithea/public/css/bootstrap.css

kallithea/public/css/contextbar.css

kallithea/public/css/style.css

360

kallithea/public/fontello/README-kallithea.txt

kallithea/public/fontello/README.txt

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)

.tx/config

➞

Show inline comments

deleted file

LICENSE.md

➞

Show inline comments

@@ @@ -209,50 +209,66 @@ Kallithea includes a minified version of @@
     git clone https://github.com/yui/builder
     git clone https://github.com/yui/yui2
     cd yui2/
     git checkout hudson-yui2-2800
     ln -sf JumpToPageDropDown.js src/paginator/js/JumpToPageDropdown.js # work around inconsistent casing
     rm -f tmp.js
     for m in yahoo event dom connection animation dragdrop element datasource autocomplete container event-delegate json datatable paginator; do
       rm -f build/\$m/\$m.js
       ( cd src/\$m && ant build deploybuild ) && sed -e 's,@VERSION@,2.9.0,g' -e 's,@BUILD@,2800,g' build/\$m/\$m.js >> tmp.js
     done
     java -jar ../builder/componentbuild/lib/yuicompressor/yuicompressor-2.4.4.jar tmp.js -o yui.2.9.js
 In compliance with GPLv3 the Corresponding Source for this Object Code is made
 available on
 [https://kallithea-scm.org/repos/mirror](https://kallithea-scm.org/repos/mirror).
 Flot
 ----
 Kallithea incorporates some CSS from a system called
 [Flot](http://code.google.com/p/flot/), which is:
 Copyright 2006 Google Inc.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 A [copy of the Apache License 2.0](Apache-License-2.0.txt) is also included
 in this distribution.
 Migrate
 -------
 Kallithea incorporates in kallithea/lib/dbmigrate/migrate parts of the Python
 system called [Migrate or sqlalchemy-migrate](https://github.com/stackforge/sqlalchemy-migrate),
 which is:
 Copyright (c) 2009 Evan Rosson, Jan Dittberner, Domen Kožar
 and licensed under the MIT-permissive license, which is
 [included in this distribution](MIT-Permissive-License.txt).
 Icon fonts
 ----------
 Kallithea incorporates subsets of both
 [Font Awesome](http://fontawesome.io) and
 [GitHub Octicons](https://octicons.github.com) for icons. Font Awesome is:
 Copyright (c) 2012, Dave Gandy
 Octicons is:
 Copyright (c) 2012-2014 GitHub
 These two sets are distributed under [SIL OFL 1.1](http://scripts.sil.org/OFL)
 and have been combined into one font called "kallithea."
 EOF

MANIFEST.in

➞

Show inline comments

 include kallithea/config/deployment.ini_tmpl
 include kallithea/lib/dbmigrate/migrate.cfg
 include README.rst
 recursive-include kallithea/i18n *
 #docs
 recursive-include docs *
 #init.d
 recursive-include init.d *
 #images
 recursive-include kallithea/public/css *
 recursive-include kallithea/public/images *
 #js
 recursive-include kallithea/public/js *
 #codemirror
 recursive-include kallithea/public/codemirror *
 #fontello
 recursive-include kallithea/public/fontello *
 #templates
 recursive-include kallithea/templates *

kallithea/config/middleware.py

➞

Show inline comments

@@ @@ -34,76 +34,79 @@ from kallithea.lib.middleware.wrapper im @@
 def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
     """Create a Pylons WSGI application and return it
     ``global_conf``
         The inherited configuration for this application. Normally from
         the [DEFAULT] section of the Paste ini file.
     ``full_stack``
         Whether or not this application provides a full WSGI stack (by
         default, meaning it handles its own exceptions and errors).
         Disable full_stack when this application is "managed" by
         another WSGI middleware.
     ``app_conf``
         The application's local configuration. Normally specified in
         the [app:<name>] section of the Paste ini file (where <name>
         defaults to main).
     """
     # Configure the Pylons environment
     config = load_environment(global_conf, app_conf)
     # The Pylons WSGI app
     app = PylonsApp(config=config)
     # Routing/Session/Cache Middleware
     app = RoutesMiddleware(app, config['routes.map'])
     app = SessionMiddleware(app, config)
     # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares)
     if asbool(config['pdebug']):
         from kallithea.lib.profiler import ProfilingMiddleware
         app = ProfilingMiddleware(app)
     if asbool(full_stack):
         from kallithea.lib.middleware.sentry import Sentry
         from kallithea.lib.middleware.errormator import Errormator
         if Errormator and asbool(config['app_conf'].get('errormator')):
             app = Errormator(app, config)
         elif Sentry:
             app = Sentry(app, config)
         # Handle Python exceptions
         app = ErrorHandler(app, global_conf, **config['pylons.errorware'])
         # we want our low level middleware to get to the request ASAP. We don't
         # need any pylons stack middleware in them
         app = SimpleHg(app, config)
         app = SimpleGit(app, config)
         app = RequestWrapper(app, config)
         # Display error documents for 401, 403, 404 status codes (and
         # 500 when debug is disabled)
         # Note: will buffer the output in memory!
         if asbool(config['debug']):
             app = StatusCodeRedirect(app)
         else:
             app = StatusCodeRedirect(app, [400, 401, 403, 404, 500])
-    #enable https redirets based on HTTP_X_URL_SCHEME set by proxy
+        # Enable https redirects based on HTTP_X_URL_SCHEME set by proxy
     if any(asbool(config.get(x)) for x in ['https_fixup', 'force_https', 'use_htsts']):
         app = HttpsFixup(app, config)
         # we want our low level middleware to get to the request ASAP. We don't
         # need any pylons stack middleware in them - especially no StatusCodeRedirect buffering
         app = SimpleHg(app, config)
         app = SimpleGit(app, config)
         app = RequestWrapper(app, config) # logging
     # Establish the Registry for this application
     app = RegistryManager(app)
+    app = RegistryManager(app) # thread / request-local module globals / variables
     if asbool(static_files):
         # Serve static files
         static_app = StaticURLParser(config['pylons.paths']['static_files'])
         app = Cascade([static_app, app])
         app = make_gzip_middleware(app, global_conf, compress_level=1)
     app.config = config
     return app

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -64,158 +64,158 @@ log = logging.getLogger(__name__) @@
 def _update_with_GET(params, GET):
     for k in ['diff1', 'diff2', 'diff']:
         params[k] += GET.getall(k)
 def anchor_url(revision, path, GET):
     fid = h.FID(revision, path)
     return h.url.current(anchor=fid, **dict(GET))
 def get_ignore_ws(fid, GET):
     ig_ws_global = GET.get('ignorews')
     ig_ws = filter(lambda k: k.startswith('WS'), GET.getall(fid))
     if ig_ws:
         try:
             return int(ig_ws[0].split(':')[-1])
         except Exception:
             pass
     return ig_ws_global
 def _ignorews_url(GET, fileid=None):
     fileid = str(fileid) if fileid else None
     params = defaultdict(list)
     _update_with_GET(params, GET)
     lbl = _('Show whitespace')
     ig_ws = get_ignore_ws(fileid, GET)
     ln_ctx = get_line_ctx(fileid, GET)
     # global option
     if fileid is None:
         if ig_ws is None:
             params['ignorews'] += [1]
             lbl = _('Ignore whitespace')
         ctx_key = 'context'
         ctx_val = ln_ctx
     # per file options
     else:
         if ig_ws is None:
             params[fileid] += ['WS:1']
             lbl = _('Ignore whitespace')
         ctx_key = fileid
         ctx_val = 'C:%s' % ln_ctx
     # if we have passed in ln_ctx pass it along to our params
     if ln_ctx:
         params[ctx_key] += [ctx_val]
     params['anchor'] = fileid
     img = h.image(h.url('/images/icons/text_strikethrough.png'), lbl, class_='icon')
     return h.link_to(img, h.url.current(**params), title=lbl, class_='tooltip')
     icon = h.literal('<i class="icon-strike"></i>')
     return h.link_to(icon, h.url.current(**params), title=lbl, class_='tooltip')
 def get_line_ctx(fid, GET):
     ln_ctx_global = GET.get('context')
     if fid:
         ln_ctx = filter(lambda k: k.startswith('C'), GET.getall(fid))
     else:
         _ln_ctx = filter(lambda k: k.startswith('C'), GET)
         ln_ctx = GET.get(_ln_ctx[0]) if _ln_ctx  else ln_ctx_global
         if ln_ctx:
             ln_ctx = [ln_ctx]
     if ln_ctx:
         retval = ln_ctx[0].split(':')[-1]
     else:
         retval = ln_ctx_global
     try:
         return int(retval)
     except Exception:
         return 3
 def _context_url(GET, fileid=None):
     """
     Generates url for context lines
     :param fileid:
     """
     fileid = str(fileid) if fileid else None
     ig_ws = get_ignore_ws(fileid, GET)
     ln_ctx = (get_line_ctx(fileid, GET) or 3) * 2
     params = defaultdict(list)
     _update_with_GET(params, GET)
     # global option
     if fileid is None:
         if ln_ctx > 0:
             params['context'] += [ln_ctx]
         if ig_ws:
             ig_ws_key = 'ignorews'
             ig_ws_val = 1
     # per file option
     else:
         params[fileid] += ['C:%s' % ln_ctx]
         ig_ws_key = fileid
         ig_ws_val = 'WS:%s' % 1
     if ig_ws:
         params[ig_ws_key] += [ig_ws_val]
     lbl = _('increase diff context to %(num)s lines') % {'num': ln_ctx}
     params['anchor'] = fileid
     img = h.image(h.url('/images/icons/table_add.png'), lbl, class_='icon')
     return h.link_to(img, h.url.current(**params), title=lbl, class_='tooltip')
     icon = h.literal('<i class="icon-sort"></i>')
     return h.link_to(icon, h.url.current(**params), title=lbl, class_='tooltip')
 class ChangesetController(BaseRepoController):
     def __before__(self):
         super(ChangesetController, self).__before__()
         c.affected_files_cut_off = 60
     def __load_data(self):
         repo_model = RepoModel()
         c.users_array = repo_model.get_users_js()
         c.user_groups_array = repo_model.get_user_groups_js()
     def _index(self, revision, method):
         c.anchor_url = anchor_url
         c.ignorews_url = _ignorews_url
         c.context_url = _context_url
         c.fulldiff = fulldiff = request.GET.get('fulldiff')
         #get ranges of revisions if preset
         rev_range = revision.split('...')[:2]
         enable_comments = True
         c.cs_repo = c.db_repo
         try:
             if len(rev_range) == 2:
                 enable_comments = False
                 rev_start = rev_range[0]
                 rev_end = rev_range[1]
                 rev_ranges = c.db_repo_scm_instance.get_changesets(start=rev_start,
                                                              end=rev_end)
             else:
                 rev_ranges = [c.db_repo_scm_instance.get_changeset(revision)]
             c.cs_ranges = list(rev_ranges)
             if not c.cs_ranges:
                 raise RepositoryError('Changeset range returned empty result')
         except(ChangesetDoesNotExistError,), e:
             log.error(traceback.format_exc())
             msg = _('Such revision does not exist for this repository')
             h.flash(msg, category='error')
             raise HTTPNotFound()
         c.changes = OrderedDict()
         c.lines_added = 0  # count of lines added
         c.lines_deleted = 0  # count of lines removes
         c.changeset_statuses = ChangesetStatus.STATUSES

kallithea/controllers/files.py

➞

Show inline comments

@@ @@ -518,110 +518,106 @@ class FilesController(BaseRepoController @@
         for a_type, ext_data in settings.ARCHIVE_SPECS.items():
             archive_spec = fname.split(ext_data[1])
             if len(archive_spec) == 2 and archive_spec[1] == '':
                 fileformat = a_type or ext_data[1]
                 revision = archive_spec[0]
                 ext = ext_data[1]
         try:
             dbrepo = RepoModel().get_by_repo_name(repo_name)
             if not dbrepo.enable_downloads:
                 return _('Downloads disabled')
             if c.db_repo_scm_instance.alias == 'hg':
                 # patch and reset hooks section of UI config to not run any
                 # hooks on fetching archives with subrepos
                 for k, v in c.db_repo_scm_instance._repo.ui.configitems('hooks'):
                     c.db_repo_scm_instance._repo.ui.setconfig('hooks', k, None)
             cs = c.db_repo_scm_instance.get_changeset(revision)
             content_type = settings.ARCHIVE_SPECS[fileformat][0]
         except ChangesetDoesNotExistError:
             return _('Unknown revision %s') % revision
         except EmptyRepositoryError:
             return _('Empty repository')
         except (ImproperArchiveTypeError, KeyError):
             return _('Unknown archive type')
         # archive cache
         from kallithea import CONFIG
         rev_name = cs.raw_id[:12]
         archive_name = '%s-%s%s' % (safe_str(repo_name.replace('/', '_')),
                                     safe_str(rev_name), ext)
         use_cached_archive = False  # defines if we use cached version of archive
         archive_cache_enabled = CONFIG.get('archive_cache_dir')
         if not subrepos and archive_cache_enabled:
             #check if we it's ok to write
             if not os.path.isdir(CONFIG['archive_cache_dir']):
                 os.makedirs(CONFIG['archive_cache_dir'])
             cached_archive_path = os.path.join(CONFIG['archive_cache_dir'], archive_name)
             if os.path.isfile(cached_archive_path):
                 log.debug('Found cached archive in %s' % cached_archive_path)
                 fd, archive = None, cached_archive_path
                 use_cached_archive = True
             else:
                 log.debug('Archive %s is not yet cached' % (archive_name))
         if not use_cached_archive:
             # generate new archive
             temp_stream = None
             try:
                 fd, archive = tempfile.mkstemp()
                 temp_stream = open(archive, 'wb')
                 log.debug('Creating new temp archive in %s' % archive)
                 cs.fill_archive(stream=temp_stream, kind=fileformat, subrepos=subrepos)
             temp_stream.close()
                 if not subrepos and archive_cache_enabled:
                     #if we generated the archive and use cache rename that
                     log.debug('Storing new archive in %s' % cached_archive_path)
                     shutil.move(archive, cached_archive_path)
                     archive = cached_archive_path
             finally:
                 if temp_stream:
                     temp_stream.close()
         def get_chunked_archive(archive):
             stream = open(archive, 'rb')
             while True:
                 data = stream.read(16 * 1024)
                 if not data:
                     stream.close()
                     if fd:  # fd means we used temporary file
                         os.close(fd)
                     if not archive_cache_enabled:
                         log.debug('Destroing temp archive %s' % archive)
                         os.remove(archive)
                     break
                 yield data
         # store download action
         action_logger(user=c.authuser,
                       action='user_downloaded_archive:%s' % (archive_name),
                       repo=repo_name, ipaddr=self.ip_addr, commit=True)
         response.content_disposition = str('attachment; filename=%s' % (archive_name))
         response.content_type = str(content_type)
         return get_chunked_archive(archive)
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def diff(self, repo_name, f_path):
         ignore_whitespace = request.GET.get('ignorews') == '1'
         line_context = request.GET.get('context', 3)
         diff2 = request.GET.get('diff2', '')
         diff1 = request.GET.get('diff1', '') or diff2
         c.action = request.GET.get('diff')
         c.no_changes = diff1 == diff2
         c.f_path = f_path
         c.big_diff = False
         c.anchor_url = anchor_url
         c.ignorews_url = _ignorews_url
         c.context_url = _context_url
         c.changes = OrderedDict()
         c.changes[diff2] = []
         #special case if we want a show rev only, it's impl here
         #to reduce JS and callbacks
         if request.GET.get('show_rev'):
             if str2bool(request.GET.get('annotate', 'False')):
                 _url = url('files_annotate_home', repo_name=c.repo_name,
                            revision=diff1, f_path=c.f_path)
             else:

kallithea/i18n/how_to

➞

Show inline comments

 ##########################
 # to create new language #
 ##########################
-Translations are available on transifex under::
+Translations are available on Hosted Weblate under::
-    https://www.transifex.com/projects/p/Kallithea/
+    https://hosted.weblate.org/projects/kallithea/kallithea/
-Preferred method is to register on transifex and request new language translation.
+Preferred method is to register on Weblate and request new language translation.
 manual creation of new language
 +++++++++++++++++++++++++++++++
 Dowload sources of Kallithea. Run::
     python setup.py develop
 To prepare the enviroment
 Make sure all translation strings are extracted by running::
     python setup.py extract_messages
 Create new language by executing following command::
     python setup.py init_catalog -l <new_language_code>
 This creates a new language under directory kallithea/i18n/<new_language_code>
 Be sure to update transifex mapping under .tx/config for new language
 Edit the new PO file located in LC_MESSAGES directory with poedit or your
 favorite PO files editor. Do translations and at the end verify the translation
 file for any errors. This can be done by executing::
     msgfmt -f -c kallithea/i18n/<new_language_code>/LC_MESSAGES/<updated_file.po>
 finally compile the translations::
     python setup.py compile_catalog -l <new_language_code>
 ##########################
 # to update translations #
 ##########################
 Fetch latest version of strings for translation by running::
     python setup.py extract_messages
 Update PO file by doing::
     python setup.py update_catalog -l <new_language_code><- to update the translations
 Edit the new updated po file. Repeat all steps after `init_catalog` step from
 new translation instructions
 ########################
 # testing translations #
 ########################
 Edit test.ini file and set lang attribute to::
     lang=<new_language_code>
 Run Kallithea tests by executing::
     nosetests

kallithea/i18n/ja/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Japanese translations for Kallithea.
 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 # Translators:
 # しろう, 2013
 # shirou - しろう, 2013
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 # こいんとす <tkondou@gmail.com>, 2013
 # Takumi IINO <trot.thunder@gmail.com>, 2013
 # whosaysni <whosaysni@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version:  Kallithea\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Japanese "
-"(http://www.transifex.com/projects/p/Kallithea/language/ja/)\n"
+"<https://hosted.weblate.org/projects/kallithea/kallithea/ja/>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr "まだチェンジセットがありません"
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr "すべてのブランチ"
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr "(閉鎖済み)"
 #: kallithea/controllers/changeset.py:87
 msgid "Show whitespace"
 msgstr "空白を表示"
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 msgid "Ignore whitespace"
 msgstr "空白を無視"
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr "diff コンテキストを %(num)s 行増やす"
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr "お探しのリビジョンはこのリポジトリにはありません"
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr "ステータス変更 -> %s"
 #: kallithea/controllers/changeset.py:386
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr "クローズしたプルリクエストに関連するチェンジセットのステータスを変更することは許可されていません"

kallithea/i18n/pt_BR/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Portuguese (Brazil) translations for Kallithea.
 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 # Translators:
 # Augusto Herrmann <augusto.herrmann@gmail.com>, 2012
 # gnustavo <gustavo@gnustavo.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version:  Kallithea\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Portuguese (Brazil) "
-"(http://www.transifex.com/projects/p/Kallithea/language/pt_BR/)\n"
+"<https://hosted.weblate.org/projects/kallithea/kallithea/pt_BR/>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr "Não há nenhum changeset ainda"
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr "Todos os Ramos"
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr "(fechado)"
 #: kallithea/controllers/changeset.py:87
 msgid "Show whitespace"
 msgstr "Mostrar espaços em branco"
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 msgid "Ignore whitespace"
 msgstr "Ignorar espaços em branco"
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr ""
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr ""
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr "Mudança de estado -> %s"
 #: kallithea/controllers/changeset.py:386
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr "Mudar o estado de um changeset associado a um pull request não é permitido"

kallithea/i18n/zh_TW/LC_MESSAGES/kallithea.po

➞

Show inline comments

 # Chinese (Taiwan) translations for Kallithea.
 # Copyright (C) 2014 RhodeCode GmbH, and others.
 # This file is distributed under the same license as the Kallithea project.
 # Translators:
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version:  Kallithea\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
 "POT-Creation-Date: 2014-07-02 19:08-0400\n"
 "PO-Revision-Date: 2014-02-13 14:34+0000\n"
 "Last-Translator: marcinkuzminski <marcin@python-blog.com>\n"
 "Language-Team: Chinese (Taiwan) "
-"(http://www.transifex.com/projects/p/Kallithea/language/zh_TW/)\n"
+"<https://hosted.weblate.org/projects/kallithea/kallithea/zh_TW/>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 #: kallithea/controllers/changelog.py:90 kallithea/controllers/compare.py:90
 #: kallithea/controllers/pullrequests.py:265
 msgid "There are no changesets yet"
 msgstr ""
 #: kallithea/controllers/changelog.py:186
 msgid "All Branches"
 msgstr ""
 #: kallithea/controllers/changelog.py:189
 msgid "(closed)"
 msgstr ""
 #: kallithea/controllers/changeset.py:87
 msgid "Show whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:94 kallithea/controllers/changeset.py:101
 msgid "Ignore whitespace"
 msgstr ""
 #: kallithea/controllers/changeset.py:167
 #, python-format
 msgid "increase diff context to %(num)s lines"
 msgstr ""
 #: kallithea/controllers/changeset.py:209 kallithea/controllers/files.py:98
 #: kallithea/controllers/files.py:121
 msgid "Such revision does not exist for this repository"
 msgstr ""
 #: kallithea/controllers/changeset.py:355
 #: kallithea/controllers/pullrequests.py:482
 #, python-format
 msgid "Status change -> %s"
 msgstr ""
 #: kallithea/controllers/changeset.py:386
 msgid ""
 "Changing status on a changeset associated with a closed pull request is "
 "not allowed"
 msgstr ""

kallithea/lib/diffs.py

➞

Show inline comments

@@ @@ -112,341 +112,347 @@ def get_gitdiff(filenode_old, filenode_n @@
     for filenode in (filenode_old, filenode_new):
         if not isinstance(filenode, FileNode):
             raise VCSError("Given object should be FileNode object, not %s"
                 % filenode.__class__)
     repo = filenode_new.changeset.repository
     old_raw_id = getattr(filenode_old.changeset, 'raw_id', repo.EMPTY_CHANGESET)
     new_raw_id = getattr(filenode_new.changeset, 'raw_id', repo.EMPTY_CHANGESET)
     vcs_gitdiff = repo.get_diff(old_raw_id, new_raw_id, filenode_new.path,
                                 ignore_whitespace, context)
     return vcs_gitdiff
 NEW_FILENODE = 1
 DEL_FILENODE = 2
 MOD_FILENODE = 3
 RENAMED_FILENODE = 4
 COPIED_FILENODE = 5
 CHMOD_FILENODE = 6
 BIN_FILENODE = 7
 class DiffLimitExceeded(Exception):
     pass
 class LimitedDiffContainer(object):
     def __init__(self, diff_limit, cur_diff_size, diff):
         self.diff = diff
         self.diff_limit = diff_limit
         self.cur_diff_size = cur_diff_size
     def __iter__(self):
         for l in self.diff:
             yield l
 class DiffProcessor(object):
     """
     Give it a unified or git diff and it returns a list of the files that were
     mentioned in the diff together with a dict of meta information that
     can be used to render it in a HTML template.
     """
     _chunk_re = re.compile(r'^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)')
     _newline_marker = re.compile(r'^\\ No newline at end of file')
     _git_header_re = re.compile(r"""
         # has already been split on this:
         #^diff[ ]--git
             [ ]a/(?P<a_path>.+?)[ ]b/(?P<b_path>.+?)\n
         (?:^similarity[ ]index[ ](?P<similarity_index>\d+)%\n
            ^rename[ ]from[ ](?P<rename_from>\S+)\n
            ^rename[ ]to[ ](?P<rename_to>\S+)(?:\n|$))?
            ^rename[ ]from[ ](?P<rename_from>.+)\n
            ^rename[ ]to[ ](?P<rename_to>.+)(?:\n|$))?
         (?:^old[ ]mode[ ](?P<old_mode>\d+)\n
            ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))?
         (?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))?
         (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))?
         (?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
             \.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n|$))?
         (?:^(?P<bin_patch>GIT[ ]binary[ ]patch)(?:\n|$))?
         (?:^---[ ](a/(?P<a_file>.+)|/dev/null)(?:\n|$))?
         (?:^\+\+\+[ ](b/(?P<b_file>.+)|/dev/null)(?:\n|$))?
         (?:^---[ ](a/(?P<a_file>.+?)|/dev/null)\t?(?:\n|$))?
         (?:^\+\+\+[ ](b/(?P<b_file>.+?)|/dev/null)\t?(?:\n|$))?
     """, re.VERBOSE | re.MULTILINE)
     _hg_header_re = re.compile(r"""
         # has already been split on this:
         #^diff[ ]--git
             [ ]a/(?P<a_path>.+?)[ ]b/(?P<b_path>.+?)\n
         (?:^old[ ]mode[ ](?P<old_mode>\d+)\n
            ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))?
         (?:^similarity[ ]index[ ](?P<similarity_index>\d+)%(?:\n|$))?
         (?:^rename[ ]from[ ](?P<rename_from>\S+)\n
            ^rename[ ]to[ ](?P<rename_to>\S+)(?:\n|$))?
         (?:^copy[ ]from[ ](?P<copy_from>\S+)\n
            ^copy[ ]to[ ](?P<copy_to>\S+)(?:\n|$))?
         (?:^rename[ ]from[ ](?P<rename_from>.+)\n
            ^rename[ ]to[ ](?P<rename_to>.+)(?:\n|$))?
         (?:^copy[ ]from[ ](?P<copy_from>.+)\n
            ^copy[ ]to[ ](?P<copy_to>.+)(?:\n|$))?
         (?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))?
         (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))?
         (?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
             \.\.(?P<b_blob_id>[0-9A-Fa-f]+)[ ]?(?P<b_mode>.+)?(?:\n|$))?
         (?:^(?P<bin_patch>GIT[ ]binary[ ]patch)(?:\n|$))?
         (?:^---[ ](a/(?P<a_file>.+)|/dev/null)(?:\n|$))?
         (?:^\+\+\+[ ](b/(?P<b_file>.+)|/dev/null)(?:\n|$))?
         (?:^---[ ](a/(?P<a_file>.+?)|/dev/null)\t?(?:\n|$))?
         (?:^\+\+\+[ ](b/(?P<b_file>.+?)|/dev/null)\t?(?:\n|$))?
     """, re.VERBOSE | re.MULTILINE)
     #used for inline highlighter word split
     _token_re = re.compile(r'()(&gt;|&lt;|&amp;|<u>\t</u>| <i></i>|\W+?)')
     _escape_re = re.compile(r'(&)|(<)|(>)|(\t)|( \n| $)')
+    _escape_re = re.compile(r'(&)|(<)|(>)|(\t)|(?<=.)( \n| $)')
     def __init__(self, diff, vcs='hg', format='gitdiff', diff_limit=None):
         """
         :param diff:   a text in diff format
         :param vcs: type of version controll hg or git
         :param format: format of diff passed, `udiff` or `gitdiff`
         :param diff_limit: define the size of diff that is considered "big"
             based on that parameter cut off will be triggered, set to None
             to show full diff
         """
         if not isinstance(diff, basestring):
             raise Exception('Diff must be a basestring got %s instead' % type(diff))
         self._diff = diff
         self._format = format
         self.adds = 0
         self.removes = 0
         # calculate diff size
         self.diff_size = len(diff)
         self.diff_limit = diff_limit
         self.cur_diff_size = 0
         self.parsed = False
         self.parsed_diff = []
         self.vcs = vcs
         if format == 'gitdiff':
             self.differ = self._highlight_line_difflib
             self._parser = self._parse_gitdiff
         else:
             self.differ = self._highlight_line_udiff
             self._parser = self._parse_udiff
     def _copy_iterator(self):
         """
         make a fresh copy of generator, we should not iterate thru
         an original as it's needed for repeating operations on
         this instance of DiffProcessor
         """
         self.__udiff, iterator_copy = tee(self.__udiff)
         return iterator_copy
     def _escaper(self, string):
         """
         Escaper for diff escapes special chars and checks the diff limit
         :param string:
         """
         self.cur_diff_size += len(string)
         # escaper gets iterated on each .next() call and it checks if each
         # parsed line doesn't exceed the diff limit
         if self.diff_limit is not None and self.cur_diff_size > self.diff_limit:
             raise DiffLimitExceeded('Diff Limit Exceeded')
         def substitute(m):
             groups = m.groups()
             if groups[0]:
                 return '&amp;'
             if groups[1]:
                 return '&lt;'
             if groups[2]:
                 return '&gt;'
             if groups[3]:
                 return '<u>\t</u>'
-            if groups[4] and m.start(): # skip 1st column with +/-
             if groups[4]:
                 return ' <i></i>'
             assert False
         return self._escape_re.sub(substitute, safe_unicode(string))
     def _line_counter(self, l):
         """
         Checks each line and bumps total adds/removes for this diff
         :param l:
         """
         if l.startswith('+') and not l.startswith('+++'):
             self.adds += 1
         elif l.startswith('-') and not l.startswith('---'):
             self.removes += 1
         return safe_unicode(l)
     def _highlight_line_difflib(self, line, next_):
         """
         Highlight inline changes in both lines.
         """
         if line['action'] == 'del':
             old, new = line, next_
         else:
             old, new = next_, line
         oldwords = self._token_re.split(old['line'])
         newwords = self._token_re.split(new['line'])
         sequence = difflib.SequenceMatcher(None, oldwords, newwords)
         oldfragments, newfragments = [], []
         for tag, i1, i2, j1, j2 in sequence.get_opcodes():
             oldfrag = ''.join(oldwords[i1:i2])
             newfrag = ''.join(newwords[j1:j2])
             if tag != 'equal':
                 if oldfrag:
                     oldfrag = '<del>%s</del>' % oldfrag
                 if newfrag:
                     newfrag = '<ins>%s</ins>' % newfrag
             oldfragments.append(oldfrag)
             newfragments.append(newfrag)
         old['line'] = "".join(oldfragments)
         new['line'] = "".join(newfragments)
     def _highlight_line_udiff(self, line, next_):
         """
         Highlight inline changes in both lines.
         """
         start = 0
         limit = min(len(line['line']), len(next_['line']))
         while start < limit and line['line'][start] == next_['line'][start]:
             start += 1
         end = -1
         limit -= start
         while -end <= limit and line['line'][end] == next_['line'][end]:
             end -= 1
         end += 1
         if start or end:
             def do(l):
                 last = end + len(l['line'])
                 if l['action'] == 'add':
                     tag = 'ins'
                 else:
                     tag = 'del'
                 l['line'] = '%s<%s>%s</%s>%s' % (
                     l['line'][:start],
                     tag,
                     l['line'][start:last],
                     tag,
                     l['line'][last:]
+                )
             do(line)
             do(next_)
     def _get_header(self, diff_chunk):
         """
         parses the diff header, and returns parts, and leftover diff
         parts consists of 14 elements::
             a_path, b_path, similarity_index, rename_from, rename_to,
             old_mode, new_mode, new_file_mode, deleted_file_mode,
             a_blob_id, b_blob_id, b_mode, a_file, b_file
         :param diff_chunk:
         """
         match = None
         if self.vcs == 'git':
             match = self._git_header_re.match(diff_chunk)
             diff = diff_chunk[match.end():]
             return match.groupdict(), imap(self._escaper, diff.splitlines(1))
         elif self.vcs == 'hg':
             match = self._hg_header_re.match(diff_chunk)
             diff = diff_chunk[match.end():]
             return match.groupdict(), imap(self._escaper, diff.splitlines(1))
         else:
         if match is None:
             raise Exception('VCS type %s is not supported' % self.vcs)
         groups = match.groupdict()
         rest = diff_chunk[match.end():]
         if rest and not rest.startswith('@') and not rest.startswith('literal '):
             raise Exception('cannot parse diff header: %r followed by %r' % (diff_chunk[:match.end()], rest[:1000]))
         difflines = imap(self._escaper, re.findall(r'.*\n|.+$', rest)) # don't split on \r as str.splitlines do
         return groups, difflines
     def _clean_line(self, line, command):
         if command in ['+', '-', ' ']:
             #only modify the line if it's actually a diff thing
             line = line[1:]
         return line
     def _parse_gitdiff(self, inline_diff=True):
         _files = []
         diff_container = lambda arg: arg
         ##split the diff in chunks of separate --git a/file b/file chunks
         for raw_diff in ('\n' + self._diff).split('\ndiff --git')[1:]:
             head, diff = self._get_header(raw_diff)
             op = None
             stats = {
                 'added': 0,
                 'deleted': 0,
                 'binary': False,
                 'ops': {},
+            }
             if head['deleted_file_mode']:
                 op = 'D'
                 stats['binary'] = True
                 stats['ops'][DEL_FILENODE] = 'deleted file'
             elif head['new_file_mode']:
                 op = 'A'
                 stats['binary'] = True
                 stats['ops'][NEW_FILENODE] = 'new file %s' % head['new_file_mode']
             else:  # modify operation, can be cp, rename, chmod
                 # CHMOD
                 if head['new_mode'] and head['old_mode']:
                     op = 'M'
                     stats['binary'] = True
                     stats['ops'][CHMOD_FILENODE] = ('modified file chmod %s => %s'
                                         % (head['old_mode'], head['new_mode']))
                 # RENAME
                 if (head['rename_from'] and head['rename_to']
                       and head['rename_from'] != head['rename_to']):
-                    op = 'M'
+                    op = 'R'
                     stats['binary'] = True
                     stats['ops'][RENAMED_FILENODE] = ('file renamed from %s to %s'
                                     % (head['rename_from'], head['rename_to']))
                 # COPY
                 if head.get('copy_from') and head.get('copy_to'):
                     op = 'M'
                     stats['binary'] = True
                     stats['ops'][COPIED_FILENODE] = ('file copied from %s to %s'
                                         % (head['copy_from'], head['copy_to']))
                 # FALL BACK: detect missed old style add or remove
                 if op is None:
                     if not head['a_file'] and head['b_file']:
                         op = 'A'
                         stats['binary'] = True
                         stats['ops'][NEW_FILENODE] = 'new file'
                     elif head['a_file'] and not head['b_file']:
                         op = 'D'
                         stats['binary'] = True
                         stats['ops'][DEL_FILENODE] = 'deleted file'
                 # it's not ADD not DELETE
                 if op is None:
                     op = 'M'
                     stats['binary'] = True
                     stats['ops'][MOD_FILENODE] = 'modified file'
             # a real non-binary diff
             if head['a_file'] or head['b_file']:
                 try:
                     chunks, _stats = self._parse_lines(diff)
                     stats['binary'] = False
                     stats['added'] = _stats[0]
                     stats['deleted'] = _stats[1]
                     # explicit mark that it's a modified file
                     if op == 'M':
                         stats['ops'][MOD_FILENODE] = 'modified file'
                 except DiffLimitExceeded:
                     diff_container = lambda _diff: \
                         LimitedDiffContainer(self.diff_limit,
                                             self.cur_diff_size, _diff)
                     break
             else:  # GIT binary patch (or empty diff)
                 # GIT Binary patch
                 if head['bin_patch']:
                     stats['ops'][BIN_FILENODE] = 'binary diff not shown'
                 chunks = []
@@ @@ -454,183 +460,189 @@ class DiffProcessor(object): @@
             if op == 'D' and chunks:
                 # a way of seeing deleted content could perhaps be nice - but
                 # not with the current UI
                 chunks = []
             chunks.insert(0, [{
                 'old_lineno': '',
                 'new_lineno': '',
                 'action':     'context',
                 'line':       msg,
                 } for _op, msg in stats['ops'].iteritems()
                   if _op not in [MOD_FILENODE]])
             _files.append({
                 'filename':         head['b_path'],
                 'old_revision':     head['a_blob_id'],
                 'new_revision':     head['b_blob_id'],
                 'chunks':           chunks,
                 'operation':        op,
                 'stats':            stats,
             })
         if not inline_diff:
             return diff_container(_files)
         # highlight inline changes
         for diff_data in _files:
             for chunk in diff_data['chunks']:
                 lineiter = iter(chunk)
                 try:
                     while 1:
                         line = lineiter.next()
                         if line['action'] not in ['unmod', 'context']:
                             nextline = lineiter.next()
                             if nextline['action'] in ['unmod', 'context'] or \
                                nextline['action'] == line['action']:
                                 continue
                             self.differ(line, nextline)
                 except StopIteration:
                     pass
         return diff_container(_files)
     def _parse_udiff(self, inline_diff=True):
         raise NotImplementedError()
     def _parse_lines(self, diff):
         """
-        Parse the diff an return data for the template.
+        Parse the diff and return data for the template.
         """
         lineiter = iter(diff)
         stats = [0, 0]
         (old_line, old_end, new_line, new_end) = (None, None, None, None)
         try:
             chunks = []
-            line = lineiter.next()
+            line = diff.next()
-            while line:
+            while True:
                 lines = []
                 chunks.append(lines)
                 match = self._chunk_re.match(line)
                 if not match:
-                    break
+                    raise Exception('error parsing diff @@ line %r' % line)
                 gr = match.groups()
                 (old_line, old_end,
                  new_line, new_end) = [int(x or 1) for x in gr[:-1]]
                 old_line -= 1
                 new_line -= 1
                 context = len(gr) == 5
                 old_end += old_line
                 new_end += new_line
                 if context:
                     # skip context only if it's first line
                     if int(gr[0]) > 1:
                         lines.append({
                             'old_lineno': '...',
                             'new_lineno': '...',
                             'action':     'context',
                             'line':       line,
                         })
-                line = lineiter.next()
+                line = diff.next()
                 while old_line < old_end or new_line < new_end:
                     command = ' '
                     if line:
                         command = line[0]
                     if not line:
                         raise Exception('error parsing diff - empty line at -%s+%s' % (old_line, new_line))
                     affects_old = affects_new = False
                     # ignore those if we don't expect them
                     if command in '#@':
                         continue
                     elif command == '+':
                     command = line[0]
                     if command == '+':
                         affects_new = True
                         action = 'add'
                         stats[0] += 1
                     elif command == '-':
                         affects_old = True
                         action = 'del'
                         stats[1] += 1
-                    else:
+                    elif command == ' ':
                         affects_old = affects_new = True
                         action = 'unmod'
                     else:
                         raise Exception('error parsing diff - unknown command in line %r at -%s+%s' % (line, old_line, new_line))
                     if not self._newline_marker.match(line):
                         old_line += affects_old
                         new_line += affects_new
                         lines.append({
                             'old_lineno':   affects_old and old_line or '',
                             'new_lineno':   affects_new and new_line or '',
                             'action':       action,
                             'line':         self._clean_line(line, command)
                         })
-                    line = lineiter.next()
+                    line = diff.next()
                     if self._newline_marker.match(line):
                         # we need to append to lines, since this is not
                         # counted in the line specs of diff
                         lines.append({
                             'old_lineno':   '...',
                             'new_lineno':   '...',
                             'action':       'context',
                             'line':         self._clean_line(line, command)
                         })
                         line = diff.next()
                 if old_line > old_end:
                         raise Exception('error parsing diff - more than %s "-" lines at -%s+%s' % (old_end, old_line, new_line))
                 if new_line > new_end:
                         raise Exception('error parsing diff - more than %s "+" lines at -%s+%s' % (new_end, old_line, new_line))
         except StopIteration:
             pass
         if old_line != old_end or new_line != new_end:
             raise Exception('diff processing broken when old %s<>%s or new %s<>%s line %r' % (old_line, old_end, new_line, new_end, line))
         return chunks, stats
     def _safe_id(self, idstring):
         """Make a string safe for including in an id attribute.
         The HTML spec says that id attributes 'must begin with
         a letter ([A-Za-z]) and may be followed by any number
         of letters, digits ([0-9]), hyphens ("-"), underscores
         ("_"), colons (":"), and periods (".")'. These regexps
         are slightly over-zealous, in that they remove colons
         and periods unnecessarily.
         Whitespace is transformed into underscores, and then
         anything which is not a hyphen or a character that
         matches \w (alphanumerics and underscore) is removed.
         """
         # Transform all whitespace to underscore
         idstring = re.sub(r'\s', "_", '%s' % idstring)
         # Remove everything that is not a hyphen or a member of \w
         idstring = re.sub(r'(?!-)\W', "", idstring).lower()
         return idstring
     def prepare(self, inline_diff=True):
         """
         Prepare the passed udiff for HTML rendering. It'l return a list
         of dicts with diff information
         """
         parsed = self._parser(inline_diff=inline_diff)
         self.parsed = True
         self.parsed_diff = parsed
         return parsed
     def as_raw(self, diff_lines=None):
         """
         Returns raw string diff
         """
         return self._diff
         #return u''.join(imap(self._line_counter, self._diff.splitlines(1)))
     def as_html(self, table_class='code-difftable', line_class='line',
                 old_lineno_class='lineno old', new_lineno_class='lineno new',
                 code_class='code', enable_comments=False, parsed_lines=None):
         """
         Return given diff as html table with customized css classes
         """
         def _link_to_if(condition, label, url):
             """

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -12,97 +12,97 @@ @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 Helper functions
 Consists of functions to typically be used within templates, but also
 available to Controllers. This module is available to both as 'h'.
 """
 import random
 import hashlib
 import StringIO
 import math
 import logging
 import re
 import urlparse
 import textwrap
 from pygments.formatters.html import HtmlFormatter
 from pygments import highlight as code_highlight
 from pylons import url
 from pylons.i18n.translation import _, ungettext
 from hashlib import md5
 from webhelpers.html import literal, HTML, escape
 from webhelpers.html.tools import *
 from webhelpers.html.builder import make_tag
 from webhelpers.html.tags import auto_discovery_link, checkbox, css_classes, \
     end_form, file, form, hidden, image, javascript_link, link_to, \
     link_to_if, link_to_unless, ol, required_legend, select, stylesheet_link, \
     submit, text, password, textarea, title, ul, xml_declaration, radio
 from webhelpers.html.tools import auto_link, button_to, highlight, \
     js_obfuscate, mail_to, strip_links, strip_tags, tag_re
 from webhelpers.number import format_byte_size, format_bit_size
 from webhelpers.pylonslib import Flash as _Flash
 from webhelpers.pylonslib.secure_form import secure_form
 from webhelpers.text import chop_at, collapse, convert_accented_entities, \
     convert_misc_entities, lchop, plural, rchop, remove_formatting, \
     replace_whitespace, urlify, truncate, wrap_paragraphs
 from webhelpers.date import time_ago_in_words
 from webhelpers.paginate import Page as _Page
 from webhelpers.html.tags import _set_input_attrs, _set_id_attr, \
     convert_boolean_attrs, NotGiven, _make_safe_id_component
 from kallithea.lib.annotate import annotate_highlight
 from kallithea.lib.utils import repo_name_slug, get_custom_lexer
 from kallithea.lib.utils2 import str2bool, safe_unicode, safe_str, \
     get_changeset_safe, datetime_to_time, time_to_datetime, AttributeDict,\
     safe_int
 from kallithea.lib.markup_renderer import MarkupRenderer
+from kallithea.lib.markup_renderer import MarkupRenderer, url_re
 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError
 from kallithea.lib.vcs.backends.base import BaseChangeset, EmptyChangeset
 from kallithea.config.conf import DATE_FORMAT, DATETIME_FORMAT
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.db import URL_SEP, Permission
 log = logging.getLogger(__name__)
 def canonical_url(*args, **kargs):
     '''Like url(x, qualified=True), but returns url that not only is qualified
     but also canonical, as configured in canonical_url'''
     from kallithea import CONFIG
     try:
         parts = CONFIG.get('canonical_url', '').split('://', 1)
         kargs['host'] = parts[1].split('/', 1)[0]
         kargs['protocol'] = parts[0]
     except IndexError:
         kargs['qualified'] = True
     return url(*args, **kargs)
 def canonical_hostname():
     '''Return canonical hostname of system'''
     from kallithea import CONFIG
     try:
         parts = CONFIG.get('canonical_url', '').split('://', 1)
         return parts[1].split('/', 1)[0]
     except IndexError:
         parts = url('home', qualified=True).split('://', 1)
         return parts[1].split('/', 1)[0]
 def html_escape(text, html_escape_table=None):
     """Produce entities within text."""
     if not html_escape_table:
         html_escape_table = {
             "&": "&amp;",
             '"': "&quot;",
             "'": "&apos;",
             ">": "&gt;",
             "<": "&lt;",
+        }
     return "".join(html_escape_table.get(c, c) for c in text)
 def shorter(text, size=20):
     postfix = '...'
     if len(text) > size:
         return text[:size - len(postfix)] + postfix
@@ @@ -543,99 +543,99 @@ def person(author, show_attr="username") @@
     # Still nothing?  Just pass back the author name if any, else the email
     return _author or _email
 def person_by_id(id_, show_attr="username"):
     # attr to return from fetched user
     person_getter = lambda usr: getattr(usr, show_attr)
     #maybe it's an ID ?
     if str(id_).isdigit() or isinstance(id_, int):
         id_ = int(id_)
         user = User.get(id_)
         if user is not None:
             return person_getter(user)
     return id_
 def desc_stylize(value):
     """
     converts tags from value into html equivalent
     :param value:
     """
     if not value:
         return ''
     value = re.sub(r'\[see\ \=\>\ *([a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\]',
                    '<div class="metatag" tag="see">see =&gt; \\1 </div>', value)
     value = re.sub(r'\[license\ \=\>\ *([a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\]',
                    '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/\\1">\\1</a></div>', value)
     value = re.sub(r'\[(requires|recommends|conflicts|base)\ \=\>\ *([a-zA-Z0-9\-\/]*)\]',
                    '<div class="metatag" tag="\\1">\\1 =&gt; <a href="/\\2">\\2</a></div>', value)
     value = re.sub(r'\[(lang|language)\ \=\>\ *([a-zA-Z\-\/\#\+]*)\]',
                    '<div class="metatag" tag="lang">\\2</div>', value)
     value = re.sub(r'\[([a-z]+)\]',
                   '<div class="metatag" tag="\\1">\\1</div>', value)
     return value
 def boolicon(value):
     """Returns boolean value of a value, represented as small html image of true/false
     icons
     :param value: value
     """
     if value:
-        return HTML.tag('i', class_="icon-ok-sign")
         return HTML.tag('i', class_="icon-ok")
     else:
-        return HTML.tag('i', class_="icon-minus-sign")
+        return HTML.tag('i', class_="icon-minus-circled")
 def action_parser(user_log, feed=False, parse_cs=False):
     """
     This helper will action_map the specified string action into translated
     fancy names with icons and links
     :param user_log: user log instance
     :param feed: use output for feeds (no html and fancy icons)
     :param parse_cs: parse Changesets into VCS instances
     """
     action = user_log.action
     action_params = ' '
     x = action.split(':')
     if len(x) > 1:
         action, action_params = x
     def get_cs_links():
         revs_limit = 3  # display this amount always
         revs_top_limit = 50  # show upto this amount of changesets hidden
         revs_ids = action_params.split(',')
         deleted = user_log.repository is None
         if deleted:
             return ','.join(revs_ids)
         repo_name = user_log.repository.repo_name
         def lnk(rev, repo_name):
             if isinstance(rev, BaseChangeset) or isinstance(rev, AttributeDict):
                 lazy_cs = True
                 if getattr(rev, 'op', None) and getattr(rev, 'ref_name', None):
                     lazy_cs = False
                     lbl = '?'
                     if rev.op == 'delete_branch':
                         lbl = '%s' % _('Deleted branch: %s') % rev.ref_name
                         title = ''
                     elif rev.op == 'tag':
                         lbl = '%s' % _('Created tag: %s') % rev.ref_name
                         title = ''
                     _url = '#'
                 else:
                     lbl = '%s' % (rev.short_id[:8])
                     _url = url('changeset_home', repo_name=repo_name,
                                revision=rev.raw_id)
@@ @@ -728,137 +728,137 @@ def action_parser(user_log, feed=False, @@
             if not feed:
                 html_tmpl = '<span id="%s" style="display:none">, %s </span>'
             else:
                 html_tmpl = '<span id="%s"> %s </span>'
             morelinks = ', '.join(
               [lnk(rev, repo_name) for rev in revs[revs_limit:]]
+            )
             if len(revs_ids) > revs_top_limit:
                 morelinks += ', ...'
             cs_links.append(html_tmpl % (uniq_id, morelinks))
         if len(revs) > 1:
             cs_links.append(compare_view)
         return ''.join(cs_links)
     def get_fork_name():
         repo_name = action_params
         _url = url('summary_home', repo_name=repo_name)
         return _('fork name %s') % link_to(action_params, _url)
     def get_user_name():
         user_name = action_params
         return user_name
     def get_users_group():
         group_name = action_params
         return group_name
     def get_pull_request():
         pull_request_id = action_params
         deleted = user_log.repository is None
         if deleted:
             repo_name = user_log.repository_name
         else:
             repo_name = user_log.repository.repo_name
         return link_to(_('Pull request #%s') % pull_request_id,
                     url('pullrequest_show', repo_name=repo_name,
                     pull_request_id=pull_request_id))
     def get_archive_name():
         archive_name = action_params
         return archive_name
     # action : translated str, callback(extractor), icon
     action_map = {
     'user_deleted_repo':           (_('[deleted] repository'),
-                                    None, 'icon-trash'),
+                                    None, 'icon-trashcan'),
     'user_created_repo':           (_('[created] repository'),
                                     None, 'icon-plus icon-plus-colored'),
     'user_created_fork':           (_('[created] repository as fork'),
-                                    None, 'icon-code-fork'),
                                     None, 'icon-fork'),
     'user_forked_repo':            (_('[forked] repository'),
-                                    get_fork_name, 'icon-code-fork'),
                                     get_fork_name, 'icon-fork'),
     'user_updated_repo':           (_('[updated] repository'),
                                     None, 'icon-pencil icon-pencil-colored'),
     'user_downloaded_archive':      (_('[downloaded] archive from repository'),
-                                    get_archive_name, 'icon-download-alt'),
+                                    get_archive_name, 'icon-download-cloud'),
     'admin_deleted_repo':          (_('[delete] repository'),
-                                    None, 'icon-trash'),
+                                    None, 'icon-trashcan'),
     'admin_created_repo':          (_('[created] repository'),
                                     None, 'icon-plus icon-plus-colored'),
     'admin_forked_repo':           (_('[forked] repository'),
-                                    None, 'icon-code-fork icon-fork-colored'),
                                     None, 'icon-fork icon-fork-colored'),
     'admin_updated_repo':          (_('[updated] repository'),
                                     None, 'icon-pencil icon-pencil-colored'),
     'admin_created_user':          (_('[created] user'),
                                     get_user_name, 'icon-user icon-user-colored'),
     'admin_updated_user':          (_('[updated] user'),
                                     get_user_name, 'icon-user icon-user-colored'),
     'admin_created_users_group':   (_('[created] user group'),
                                     get_users_group, 'icon-pencil icon-pencil-colored'),
     'admin_updated_users_group':   (_('[updated] user group'),
                                     get_users_group, 'icon-pencil icon-pencil-colored'),
     'user_commented_revision':     (_('[commented] on revision in repository'),
                                     get_cs_links, 'icon-comment icon-comment-colored'),
     'user_commented_pull_request': (_('[commented] on pull request for'),
                                     get_pull_request, 'icon-comment icon-comment-colored'),
     'user_closed_pull_request':    (_('[closed] pull request for'),
-                                    get_pull_request, 'icon-check'),
+                                    get_pull_request, 'icon-ok'),
     'push':                        (_('[pushed] into'),
-                                    get_cs_links, 'icon-arrow-up'),
+                                    get_cs_links, 'icon-move-up'),
     'push_local':                  (_('[committed via Kallithea] into repository'),
                                     get_cs_links, 'icon-pencil icon-pencil-colored'),
     'push_remote':                 (_('[pulled from remote] into repository'),
-                                    get_cs_links, 'icon-arrow-up'),
+                                    get_cs_links, 'icon-move-up'),
     'pull':                        (_('[pulled] from'),
-                                    None, 'icon-arrow-down'),
+                                    None, 'icon-move-down'),
     'started_following_repo':      (_('[started following] repository'),
                                     None, 'icon-heart icon-heart-colored'),
     'stopped_following_repo':      (_('[stopped following] repository'),
                                     None, 'icon-heart-empty icon-heart-colored'),
+    }
     action_str = action_map.get(action, action)
     if feed:
         action = action_str[0].replace('[', '').replace(']', '')
     else:
         action = action_str[0]\
             .replace('[', '<span class="journal_highlight">')\
             .replace(']', '</span>')
     action_params_func = lambda: ""
     if callable(action_str[1]):
         action_params_func = action_str[1]
     def action_parser_icon():
         action = user_log.action
         action_params = None
         x = action.split(':')
         if len(x) > 1:
             action, action_params = x
         tmpl = """<i class="%s" alt="%s"></i>"""
         ico = action_map.get(action, ['', '', ''])[2]
         return literal(tmpl % (ico, action))
     # returned callbacks we need to call to get
     return [lambda: literal(action), action_params_func, action_parser_icon]
 #==============================================================================
 # PERMS
 #==============================================================================
 from kallithea.lib.auth import HasPermissionAny, HasPermissionAll, \
 HasRepoPermissionAny, HasRepoPermissionAll, HasRepoGroupPermissionAll, \
 HasRepoGroupPermissionAny
 #==============================================================================
 # GRAVATAR URL
 #==============================================================================
@@ @@ -1211,103 +1211,100 @@ def fancy_file_stats(stats): @@
         elif RENAMED_FILENODE in stats['ops']:
             lbl += _('rename')
             bin_op = RENAMED_FILENODE
         #chmod can go with other operations
         if CHMOD_FILENODE in stats['ops']:
             _org_lbl = _('chmod')
             lbl += _org_lbl if lbl.endswith('+') else '+%s' % _org_lbl
         #import ipdb;ipdb.set_trace()
         b_d = '<div class="bin bin%s %s" style="width:100%%">%s</div>' % (bin_op, cgen('a', a_v='', d_v=0), lbl)
         b_a = '<div class="bin bin1" style="width:0%%"></div>'
         return literal('<div style="width:%spx">%s%s</div>' % (width, b_a, b_d))
     t = stats['added'] + stats['deleted']
     unit = float(width) / (t or 1)
     # needs > 9% of width to be visible or 0 to be hidden
     a_p = max(9, unit * a) if a > 0 else 0
     d_p = max(9, unit * d) if d > 0 else 0
     p_sum = a_p + d_p
     if p_sum > width:
         #adjust the percentage to be == 100% since we adjusted to 9
         if a_p > d_p:
             a_p = a_p - (p_sum - width)
         else:
             d_p = d_p - (p_sum - width)
     a_v = a if a > 0 else ''
     d_v = d if d > 0 else ''
     d_a = '<div class="added %s" style="width:%s%%">%s</div>' % (
         cgen('a', a_v, d_v), a_p, a_v
+    )
     d_d = '<div class="deleted %s" style="width:%s%%">%s</div>' % (
         cgen('d', a_v, d_v), d_p, d_v
+    )
     return literal('<div style="width:%spx">%s%s</div>' % (width, d_a, d_d))
 def urlify_text(text_, safe=True):
     """
     Extrac urls from text and make html links out of them
     :param text_:
     """
     url_pat = re.compile(r'''(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+#]'''
                          '''|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)''')
     def url_func(match_obj):
         url_full = match_obj.groups()[0]
         return '<a href="%(url)s">%(url)s</a>' % ({'url': url_full})
-    _newtext = url_pat.sub(url_func, text_)
+    _newtext = url_re.sub(url_func, text_)
     if safe:
         return literal(_newtext)
     return _newtext
 def urlify_changesets(text_, repository):
     """
     Extract revision ids from changeset and make link from them
     :param text_:
     :param repository: repo name to build the URL with
     """
     from pylons import url  # doh, we need to re-import url to mock it later
     def url_func(match_obj):
         rev = match_obj.group(0)
         return '<a class="revision-link" href="%(url)s">%(rev)s</a>' % {
          'url': url('changeset_home', repo_name=repository, revision=rev),
          'rev': rev,
+        }
     return re.sub(r'(?:^|(?<=\s))([0-9a-fA-F]{12,40})(?=$|\s|[.,:])', url_func, text_)
 def urlify_commit(text_, repository, link_=None):
     """
     Parses given text message and makes proper links.
     issues are linked to given issue-server, and rest is a changeset link
     if link_ is given, in other case it's a plain text
     :param text_:
     :param repository:
     :param link_: changeset link
     """
     import traceback
     from pylons import url  # doh, we need to re-import url to mock it later
     def escaper(string):
         return string.replace('<', '&lt;').replace('>', '&gt;')
     def linkify_others(t, l):
         urls = re.compile(r'(\<a.*?\<\/a\>)',)
         links = []
         for e in urls.split(t):
             if not urls.match(e):
                 links.append('<a class="message-link" href="%s">%s</a>' % (l, e))
             else:
                 links.append(e)

kallithea/lib/markup_renderer.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 kallithea.lib.markup_renderer
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Renderer for markup languages with ability to parse using rst or markdown
 This file was forked by the Kallithea project in July 2014.
 Original author and date, and relevant copyright and licensing information is below:
 :created_on: Oct 27, 2011
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import re
 import logging
 import traceback
 from kallithea.lib.utils2 import safe_unicode, MENTIONS_REGEX
 log = logging.getLogger(__name__)
 url_re = re.compile(r'''(\bhttps?://(?:[\da-zA-Z0-9@:.-]+)'''
                     r'''(?:[/a-zA-Z0-9_=@#~&+%.,:?!*()-]*[/a-zA-Z0-9_=@#~])?)''')
 class MarkupRenderer(object):
     RESTRUCTUREDTEXT_DISALLOWED_DIRECTIVES = ['include', 'meta', 'raw']
     MARKDOWN_PAT = re.compile(r'md|mkdn?|mdown|markdown', re.IGNORECASE)
     RST_PAT = re.compile(r're?st', re.IGNORECASE)
     PLAIN_PAT = re.compile(r'readme', re.IGNORECASE)
     def _detect_renderer(self, source, filename=None):
         """
         runs detection of what renderer should be used for generating html
         from a markup language
         filename can be also explicitly a renderer name
         :param source:
         :param filename:
         """
         if MarkupRenderer.MARKDOWN_PAT.findall(filename):
             detected_renderer = 'markdown'
         elif MarkupRenderer.RST_PAT.findall(filename):
             detected_renderer = 'rst'
         elif MarkupRenderer.PLAIN_PAT.findall(filename):
             detected_renderer = 'rst'
         else:
             detected_renderer = 'plain'
         return getattr(MarkupRenderer, detected_renderer)
     @classmethod
     def _flavored_markdown(cls, text):
         """
         Github style flavored markdown
         :param text:
         """
         from hashlib import md5
         # Extract pre blocks.
         extractions = {}
         def pre_extraction_callback(matchobj):
             digest = md5(matchobj.group(0)).hexdigest()
             extractions[digest] = matchobj.group(0)
             return "{gfm-extraction-%s}" % digest
         pattern = re.compile(r'<pre>.*?</pre>', re.MULTILINE | re.DOTALL)
         text = re.sub(pattern, pre_extraction_callback, text)
         # Prevent foo_bar_baz from ending up with an italic word in the middle.
         def italic_callback(matchobj):
             s = matchobj.group(0)
             if list(s).count('_') >= 2:
                 return s.replace('_', '\_')
             return s
         text = re.sub(r'^(?! {4}|\t)\w+_\w+_\w[\w_]*', italic_callback, text)
         # In very clear cases, let newlines become <br /> tags.
         def newline_callback(matchobj):
             if len(matchobj.group(1)) == 1:
                 return matchobj.group(0).rstrip() + '  \n'
             else:
                 return matchobj.group(0)
         pattern = re.compile(r'^[\w\<][^\n]*(\n+)', re.MULTILINE)
         text = re.sub(pattern, newline_callback, text)
         # Insert pre block extractions.
         def pre_insert_callback(matchobj):
             return '\n\n' + extractions[matchobj.group(1)]
         text = re.sub(r'{gfm-extraction-([0-9a-f]{32})\}',
                       pre_insert_callback, text)
         return text
     def render(self, source, filename=None):
         """
         Renders a given filename using detected renderer
         it detects renderers based on file extension or mimetype.
         At last it will just do a simple html replacing new lines with <br/>
         :param file_name:
         :param source:
         """
         renderer = self._detect_renderer(source, filename)
         readme_data = renderer(source)
         return readme_data
     @classmethod
     def plain(cls, source, universal_newline=True):
         source = safe_unicode(source)
         if universal_newline:
             newline = '\n'
             source = newline.join(source.splitlines())
         def urlify_text(text):
             url_pat = re.compile(r'(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+#]'
                                  '|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)')
             def url_func(match_obj):
                 url_full = match_obj.groups()[0]
                 return '<a href="%(url)s">%(url)s</a>' % ({'url': url_full})
             return url_pat.sub(url_func, text)
         source = urlify_text(source)
         source = url_re.sub(url_func, source)
         return '<br />' + source.replace("\n", '<br />')
     @classmethod
     def markdown(cls, source, safe=True, flavored=False):
         source = safe_unicode(source)
         try:
             import markdown as __markdown
             if flavored:
                 source = cls._flavored_markdown(source)
             return __markdown.markdown(source, ['codehilite', 'extra'])
         except ImportError:
             log.warning('Install markdown to use this function')
             return cls.plain(source)
         except Exception:
             log.error(traceback.format_exc())
             if safe:
                 log.debug('Fallbacking to render in plain mode')
                 return cls.plain(source)
             else:
                 raise
     @classmethod
     def rst(cls, source, safe=True):
         source = safe_unicode(source)
         try:
             from docutils.core import publish_parts
             from docutils.parsers.rst import directives
             docutils_settings = dict([(alias, None) for alias in
                                 cls.RESTRUCTUREDTEXT_DISALLOWED_DIRECTIVES])
             docutils_settings.update({'input_encoding': 'unicode',
                                       'report_level': 4})
             for k, v in docutils_settings.iteritems():
                 directives.register_directive(k, v)
             parts = publish_parts(source=source,
                                   writer_name="html4css1",
                                   settings_overrides=docutils_settings)
             return parts['html_title'] + parts["fragment"]
         except ImportError:
             log.warning('Install docutils to use this function')
             return cls.plain(source)
         except Exception:
             log.error(traceback.format_exc())
             if safe:
                 log.debug('Fallbacking to render in plain mode')

kallithea/model/db.py

➞

Show inline comments

@@ @@ -2264,100 +2264,101 @@ class PullRequest(Base, BaseModel): @@
     updated_on = Column('updated_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
     _revisions = Column('revisions', UnicodeText(20500))  # 500 revisions max
     org_repo_id = Column('org_repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
     org_ref = Column('org_ref', Unicode(256), nullable=False)
     other_repo_id = Column('other_repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
     other_ref = Column('other_ref', Unicode(256), nullable=False)
     @hybrid_property
     def revisions(self):
         return self._revisions.split(':')
     @revisions.setter
     def revisions(self, val):
         self._revisions = ':'.join(val)
     @property
     def org_ref_parts(self):
         return self.org_ref.split(':')
     @property
     def other_ref_parts(self):
         return self.other_ref.split(':')
     author = relationship('User', lazy='joined')
     reviewers = relationship('PullRequestReviewers',
                              cascade="all, delete, delete-orphan")
     org_repo = relationship('Repository', primaryjoin='PullRequest.org_repo_id==Repository.repo_id')
     other_repo = relationship('Repository', primaryjoin='PullRequest.other_repo_id==Repository.repo_id')
     statuses = relationship('ChangesetStatus')
     comments = relationship('ChangesetComment',
                              cascade="all, delete, delete-orphan")
     def is_closed(self):
         return self.status == self.STATUS_CLOSED
     @property
     def last_review_status(self):
         return str(self.statuses[-1].status) if self.statuses else ''
     def __json__(self):
         return dict(
             revisions=self.revisions
+        )
     def url(self, **kwargs):
         canonical = kwargs.pop('canonical', None)
         import kallithea.lib.helpers as h
         s = '/' + self.title
         b = self.org_ref_parts[1]
         if b != self.other_ref_parts[1]:
             s = '/_%s_%s' % (b, s)
             s = '/_/' + b
         else:
             s = '/_/' + self.title
         kwargs['extra'] = urlreadable(s)
         if canonical:
             return h.canonical_url('pullrequest_show', repo_name=self.other_repo.repo_name,
                                    pull_request_id=self.pull_request_id, **kwargs)
         return h.url('pullrequest_show', repo_name=self.other_repo.repo_name,
                      pull_request_id=self.pull_request_id, **kwargs)
 class PullRequestReviewers(Base, BaseModel):
     __tablename__ = 'pull_request_reviewers'
     __table_args__ = (
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
     def __init__(self, user=None, pull_request=None):
         self.user = user
         self.pull_request = pull_request
     pull_requests_reviewers_id = Column('pull_requests_reviewers_id', Integer(), nullable=False, primary_key=True)
     pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=False)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True)
     user = relationship('User')
     pull_request = relationship('PullRequest')
 class Notification(Base, BaseModel):
     __tablename__ = 'notifications'
     __table_args__ = (
         Index('notification_type_idx', 'type'),
         {'extend_existing': True, 'mysql_engine': 'InnoDB',
          'mysql_charset': 'utf8', 'sqlite_autoincrement': True},
+    )
     TYPE_CHANGESET_COMMENT = u'cs_comment'
     TYPE_MESSAGE = u'message'
     TYPE_MENTION = u'mention'
     TYPE_REGISTRATION = u'registration'
     TYPE_PULL_REQUEST = u'pull_request'
     TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment'
     notification_id = Column('notification_id', Integer(), nullable=False, primary_key=True)
     subject = Column('subject', Unicode(512), nullable=True)
     body = Column('body', UnicodeText(50000), nullable=True)
     created_by = Column("created_by", Integer(), ForeignKey('users.user_id'), nullable=True)
     created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
     type_ = Column('type', Unicode(256))

kallithea/public/css/bootstrap.css

➞

Show inline comments

@@ @@ -2499,97 +2499,97 @@ input[type="button"].btn-block { @@
 .glyphicon-cog:before {
   content: "\e019";
+}
 .glyphicon-trash:before {
   content: "\e020";
+}
 .glyphicon-home:before {
   content: "\e021";
+}
 .glyphicon-file:before {
   content: "\e022";
+}
 .glyphicon-time:before {
   content: "\e023";
+}
 .glyphicon-road:before {
   content: "\e024";
+}
 .glyphicon-download-alt:before {
   content: "\e025";
+}
 .glyphicon-download:before {
   content: "\e026";
+}
 .glyphicon-upload:before {
   content: "\e027";
+}
 .glyphicon-inbox:before {
   content: "\e028";
+}
 .glyphicon-play-circle:before {
   content: "\e029";
+}
 .glyphicon-repeat:before {
   content: "\e030";
+}
-.glyphicon-refresh:before {
+.glyphicon-arrows-cw:before {
   content: "\e031";
+}
 .glyphicon-list-alt:before {
   content: "\e032";
+}
 .glyphicon-flag:before {
   content: "\e034";
+}
 .glyphicon-headphones:before {
   content: "\e035";
+}
 .glyphicon-volume-off:before {
   content: "\e036";
+}
 .glyphicon-volume-down:before {
   content: "\e037";
+}
 .glyphicon-volume-up:before {
   content: "\e038";
+}
 .glyphicon-qrcode:before {
   content: "\e039";
+}
 .glyphicon-barcode:before {
   content: "\e040";
+}
 .glyphicon-tag:before {
   content: "\e041";
+}
 .glyphicon-tags:before {
   content: "\e042";
+}
 .glyphicon-book:before {
   content: "\e043";
+}
 .glyphicon-print:before {

kallithea/public/css/contextbar.css

➞

Show inline comments

 /**
  * Stylesheets for the context bar
  */
 i.icon-archive { background-image: url("../images/icons/database_edit.png"); }
 i.icon-arrow-right { background-image: url('../images/icons/arrow_right.png');}
 i.icon-ban-circle { background-image: url("../images/icons/cancel.png"); }
 i.icon-bar-chart { background-image: url("../images/icons/chart_bar.png"); }
 i.icon-book { background-image: url("../images/icons/book.png"); }
 i.icon-bookmark { background-image: url("../images/icons/tag_green.png"); }
 i.icon-code-fork { background-image: url("../images/icons/arrow_branch.png"); }
 i.icon-code-merge { background-image: url("../images/icons/arrow_merge.png"); } /* unused! */
 i.icon-cog { background-image: url("../images/icons/cog_edit.png"); }
 i.icon-cog { background-image: url("../images/icons/cog.png"); }
 i.icon-cogs { background-image: url("../images/icons/table_gear.png"); }
 i.icon-ellipsis-horizontal:after { content: ' ...';}
 i.icon-eye-open { background-image: url("../images/icons/eye.png"); }
 i.icon-file-2 { background-image: url("../images/icons/note.png"); }
 i.icon-file-alt { background-image: url("../images/icons/note_add.png"); }
 i.icon-file { background-image: url("../images/icons/file.png"); }
 i.icon-file-text { background-image: url("../images/icons/clipboard_16.png"); }
 i.icon-file-txt { background-image: url("../images/icons/note_error.png"); }
 i.icon-folder-close { background-image: url("../images/icons/database_link.png"); }
 i.icon-git { background-image: url('../images/icons/giticon.png');}
 i.icon-group { background-image: url("../images/icons/group_edit.png"); }
 i.icon-heart { background-image: url("../images/icons/heart_delete.png"); }
 i.icon-heart-empty { background-image: url("../images/icons/heart.png"); }
 i.icon-hg { background-image: url('../images/icons/hgicon.png');}
 i.icon-key { background-image: url("../images/icons/server_key.png"); }
 i.icon-lock { background-image: url('../images/icons/lock.png');}
 i.icon-lock-alt { background-image: url('../images/icons/private_repo.png');}
 i.icon-loop { background-image: url('../images/icons/arrow_inout.png');}
 i.icon-loop-2 { background-image: url('../images/icons/arrow_inout.png');}
 i.icon-private { background-image: url('../images/icons/private_repo.png');}
 i.icon-public { background-image: url('../images/icons/public_repo.png');}
 i.icon-random { background-image: url("../images/icons/arrow_switch.png"); }
 i.icon-refresh { background-image: url('../images/icons/arrow_refresh.png');}
 i.icon-search { background-image: url("../images/icons/search_16.png"); }
 i.icon-tag { background-image: url("../images/icons/tag_blue.png"); }
 i.icon-time { background-image: url("../images/icons/time.png"); }
 i.icon-list-alt { background-image: url("../images/icons/time.png"); }
 i.icon-unlock { background-image: url('../images/icons/lock_open.png');}
 i.icon-unlock-alt { background-image: url('../images/icons/public_repo.png');}
 i.icon-user { background-image: url("../images/icons/user_edit.png"); }
 i.icon-wrench { background-image: url("../images/icons/wrench.png"); }
 i.icon-rss-sign { background-image: url('../images/icons/rss_16.png');}
 i.icon-plus-sign { background-image: url('../images/icons/add.png');}
 i.icon-chevron-left:after { content: "\00AB";}
 i.icon-chevron-right:after { content: "\00BB";}
 i.icon-copy { background-image: url('../images/icons/note_add.png');}
 i.icon-pencil { background-image: url('../images/icons/application_form_edit.png');}
 i.icon-remove { background-image: url('../images/icons/delete.png');}
 i.icon-remove-sign { background-image: url('../images/icons/delete.png');}
 i.icon-plus { background-image: url('../images/icons/plus_16.png');}
 i.icon-resize-vertical { background-image: url('../images/icons/text_align_left.png');}
 i.icon-ok-sign { background-image: url('../images/icons/tick.png');}
 i.icon-minus-sign { background-image: url('../images/icons/delete.png');}
 i.icon-disabled { background-image: url('../images/icons/shading.png');} /* todo: use instead of minus sign */
 i[class^='icon-'] {
     background-repeat: no-repeat;
     background-position: center;
     display: inline-block;
     width: 16px;
     height: 16px;
     min-width: 16px;
     min-height: 16px;
     margin: -2px 0 -4px 0;
     /* background-color: red; /* for debugging */
+}
 /* css classes for diff file status ... it'd be nice if css had a way to
    inherit from another class but alas, we must make sure this content is the
    same from the icon font file */
 .icon-diff-M:before {
     font-family: 'kallithea';
     content: '\e805';
     color: #d0b44c;
+}
 .icon-diff-D:before {
     font-family: 'kallithea';
     content: '\e807';
     color: #bd2c00;
+}
 .icon-diff-A:before {
     font-family: 'kallithea';
     content: '\e806';
     color: #6cc644;
+}
 .icon-diff-R:before {
     font-family: 'kallithea';
     content: '\e81f';
     color: #677a85;
 }
 #content #context-bar {
     position: relative;
     overflow: visible;
     background-color: #577632;
     padding: 0 5px;
     min-height: 36px;
 }
 #content #context-bar h2 {
     display: inline-block;
     color: #FFF;
 }
 #header #header-inner #quick a,
 #content #context-bar,
 #content #context-bar a {
     color: #FFFFFF;
 }
 #header #header-inner #quick a:hover,
 #content #context-bar a:hover {
     text-decoration: none;
 }
 #content #context-bar .icon {
     display: inline-block;
     width: 16px;
     height: 16px;
     vertical-align: text-bottom;
 }
 ul.horizontal-list {
     display: block;
 }
 ul.horizontal-list > li {
     float: left;
     position: relative;
 }
 #header #header-inner #quick ul,
 ul.horizontal-list > li ul {
     position: absolute;
     display: none;
     right: 0;
     z-index: 999;

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -456,254 +456,147 @@ div.header img { @@
 #header #header-inner #quick li span.normal {
     border: none;
     padding: 10px 12px 8px;
+}
 #header #header-inner #quick li span.icon {
     border-left: none;
     padding-left: 10px;
+}
 #header #header-inner #quick li span.icon_short {
     top: 0;
     left: 0;
     border-left: none;
     border-right: 1px solid #2e5c89;
     padding: 8px 6px 4px;
+}
 #header #header-inner #quick li span.icon img,
 #header #header-inner #quick li span.icon_short img {
     vertical-align: middle;
     margin-bottom: 2px;
+}
 #header #header-inner #quick ul.repo_switcher {
     max-height: 275px;
     overflow-x: hidden;
     overflow-y: auto;
+}
 #header #header-inner #quick ul.repo_switcher li.qfilter_rs {
     padding: 2px 3px;
     padding-right: 17px;
+}
 #header #header-inner #quick ul.repo_switcher li.qfilter_rs input {
     width: 100%;
     border-radius: 10px;
     padding: 2px 7px;
+}
 #header #header-inner #quick .repo_switcher_type {
     position: absolute;
     left: 0;
     top: 9px;
     margin: 0px 2px 0px 2px;
+}
 #header #header-inner #quick li ul li a.journal,
 #header #header-inner #quick li ul li a.journal:hover {
     background-image: url("../images/icons/book.png");
+}
 #header #header-inner #quick li ul li a.private_repo,
 #header #header-inner #quick li ul li a.private_repo:hover {
     background-image: url("../images/icons/private_repo.png")
+}
 #header #header-inner #quick li ul li a.public_repo,
 #header #header-inner #quick li ul li a.public_repo:hover {
     background-image: url("../images/icons/public_repo.png");
+}
 #header #header-inner #quick li ul li a.hg,
 #header #header-inner #quick li ul li a.hg:hover {
     background-image: url("../images/icons/hgicon.png");
     padding-left: 42px;
     background-position: 20px 9px;
+}
 #header #header-inner #quick li ul li a.git,
 #header #header-inner #quick li ul li a.git:hover {
     background-image: url("../images/icons/giticon.png");
     padding-left: 42px;
     background-position: 20px 9px;
+}
 #header #header-inner #quick li ul li a.repos,
 #header #header-inner #quick li ul li a.repos:hover {
     background-image: url("../images/icons/database_edit.png");
+}
 #header #header-inner #quick li ul li a.repos_groups,
 #header #header-inner #quick li ul li a.repos_groups:hover {
     background-image: url("../images/icons/database_link.png");
+}
 #header #header-inner #quick li ul li a.users,
 #header #header-inner #quick li ul li a.users:hover {
     background-image: url("../images/icons/user_edit.png");
+}
 #header #header-inner #quick li ul li a.groups,
 #header #header-inner #quick li ul li a.groups:hover {
     background-image: url("../images/icons/group_edit.png");
+}
 #header #header-inner #quick li ul li a.defaults,
 #header #header-inner #quick li ul li a.defaults:hover {
     background-image: url("../images/icons/wrench.png");
+}
 #header #header-inner #quick li ul li a.settings,
 #header #header-inner #quick li ul li a.settings:hover {
     background-image: url("../images/icons/cog.png");
+}
 #header #header-inner #quick li ul li a.permissions,
 #header #header-inner #quick li ul li a.permissions:hover {
     background-image: url("../images/icons/key.png");
+}
 #header #header-inner #quick li ul li a.ldap,
 #header #header-inner #quick li ul li a.ldap:hover {
     background-image: url("../images/icons/server_key.png");
+}
 #header #header-inner #quick li ul li a.fork,
 #header #header-inner #quick li ul li a.fork:hover {
     background-image: url("../images/icons/arrow_divide.png");
+}
 #header #header-inner #quick li ul li a.locking_add,
 #header #header-inner #quick li ul li a.locking_add:hover {
     background-image: url("../images/icons/lock_add.png");
+}
 #header #header-inner #quick li ul li a.locking_del,
 #header #header-inner #quick li ul li a.locking_del:hover {
     background-image: url("../images/icons/lock_delete.png");
+}
 #header #header-inner #quick li ul li a.pull_request,
 #header #header-inner #quick li ul li a.pull_request:hover {
     background-image: url("../images/icons/arrow_join.png") ;
+}
 #header #header-inner #quick li ul li a.compare_request,
 #header #header-inner #quick li ul li a.compare_request:hover {
     background-image: url("../images/icons/arrow_inout.png");
+}
 #header #header-inner #quick li ul li a.search,
 #header #header-inner #quick li ul li a.search:hover {
     background-image: url("../images/icons/search_16.png");
+}
 #header #header-inner #quick li ul li a.delete,
 #header #header-inner #quick li ul li a.delete:hover {
     background-image: url("../images/icons/delete.png");
+}
 #header #header-inner #quick li ul li a.branches,
 #header #header-inner #quick li ul li a.branches:hover {
     background-image: url("../images/icons/arrow_branch.png");
+}
 #header #header-inner #quick li ul li a.tags,
 #header #header-inner #quick li ul li a.tags:hover {
     background: #FFF url("../images/icons/tag_blue.png") no-repeat 4px 9px;
     width: 167px;
     margin: 0;
     padding: 12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.bookmarks,
 #header #header-inner #quick li ul li a.bookmarks:hover {
     background: #FFF url("../images/icons/tag_green.png") no-repeat 4px 9px;
     width: 167px;
     margin: 0;
     padding: 12px 9px 7px 24px;
+}
 #header #header-inner #quick li ul li a.admin,
 #header #header-inner #quick li ul li a.admin:hover {
     background: #FFF url("../images/icons/cog_edit.png") no-repeat 4px 9px;
     width: 167px;
     margin: 0;
     padding: 12px 9px 7px 24px;
+}
 .groups_breadcrumbs a {
     color: #fff;
+}
 .groups_breadcrumbs a:hover {
     color: #bfe3ff;
     text-decoration: none;
+}
 td.quick_repo_menu:before {
     font-family: "kallithea";
     content: "\e80f";           /* triangle-right */
     margin-left: 3px;
     padding-right: 3px;
+}
 td.quick_repo_menu {
     background: #FFF url("../images/vertical-indicator.png") 8px 50% no-repeat !important;
     cursor: pointer;
     width: 8px;
     border: 1px solid transparent;
+}
 td.quick_repo_menu.active:before {
     font-family: "kallithea";
     content: "\e80d";           /* triangle-down */
     margin-left: 1px;
     padding-right: 0px;
+}
 td.quick_repo_menu.active {
     background: url("../images/dt-arrow-dn.png") no-repeat scroll 5px 50% #FFFFFF !important;
     border: 1px solid #577632;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
     cursor: pointer;
+}
 td.quick_repo_menu .menu_items {
-    margin-top: 10px;
+    margin-top: 5px;
     margin-left: -6px;
     width: 150px;
     position: absolute;
     background-color: #FFF;
     background: none repeat scroll 0 0 #FFFFFF;
     border-color: #577632 #666666 #666666;
     border-right: 1px solid #666666;
     border-style: solid;
     border-width: 1px;
     box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2);
     border-top-style: none;
+}
 td.quick_repo_menu .menu_items li {
     padding: 0 !important;
+}
 td.quick_repo_menu .menu_items a {
     display: block;
     padding: 4px 12px 4px 8px;
+}
 td.quick_repo_menu .menu_items a:hover {
     background-color: #EEE;
     text-decoration: none;
+}
 td.quick_repo_menu .menu_items .icon img {
     margin-bottom: -2px;
+}
 td.quick_repo_menu .menu_items.hidden {
     display: none;
+}
 .yui-dt-first th {
     text-align: left;
+}
 /*
     Copyright (c) 2011, Yahoo! Inc. All rights reserved.
     Code licensed under the BSD License:
     http://developer.yahoo.com/yui/license.html
     version: 2.9.0
 */
 .yui-skin-sam .yui-dt-mask {
     position: absolute;
     z-index: 9500;
@@ @@ -733,189 +626,175 @@ td.quick_repo_menu .menu_items.hidden { @@
 th.yui-dt-resizeable .yui-dt-resizerliner { position: relative }
 .yui-dt-resizer {
     position: absolute;
     right: 0;
     bottom: 0;
     height: 100%;
     cursor: e-resize;
     cursor: col-resize;
     background-color: #CCC;
     opacity: 0;
     filter: alpha(opacity=0);
+}
 .yui-dt-resizerproxy {
     visibility: hidden;
     position: absolute;
     z-index: 9000;
     background-color: #CCC;
     opacity: 0;
     filter: alpha(opacity=0);
+}
 th.yui-dt-hidden .yui-dt-liner,
 td.yui-dt-hidden .yui-dt-liner,
 th.yui-dt-hidden .yui-dt-resizer { display: none }
 .yui-dt-editor,
 .yui-dt-editor-shim {
     position: absolute;
     z-index: 9000;
+}
 .yui-skin-sam .yui-dt table {
     margin: 0;
     padding: 0;
     font-family: arial;
     font-size: inherit;
     border-collapse: separate;
     *border-collapse: collapse;
     border-spacing: 0;
     border: 1px solid #7f7f7f;
+}
 .yui-skin-sam .yui-dt thead { border-spacing: 0 }
 .yui-skin-sam .yui-dt caption {
     color: #000;
     font-size: 85%;
     font-weight: normal;
     font-style: italic;
     line-height: 1;
     padding: 1em 0;
     text-align: center;
+}
 .yui-skin-sam .yui-dt th { background: #d8d8da url(../images/sprite.png) repeat-x 0 0 }
 .yui-skin-sam .yui-dt th,
 .yui-skin-sam .yui-dt th a {
     font-weight: normal;
     text-decoration: none;
     color: #000;
     vertical-align: bottom;
+}
 .yui-skin-sam .yui-dt th {
     margin: 0;
     padding: 0;
     border: 0;
     border-right: 1px solid #cbcbcb;
+}
 .yui-skin-sam .yui-dt tr.yui-dt-first td { border-top: 1px solid #7f7f7f }
 .yui-skin-sam .yui-dt th .yui-dt-liner { white-space: nowrap }
 .yui-skin-sam .yui-dt-liner {
     margin: 0;
     padding: 0;
+}
 .yui-skin-sam .yui-dt-coltarget {
     width: 5px;
     background-color: red;
+}
 .yui-skin-sam .yui-dt td {
     margin: 0;
     padding: 0;
     border: 0;
     border-right: 1px solid #cbcbcb;
     text-align: left;
+}
 .yui-skin-sam .yui-dt-list td { border-right: 0 }
 .yui-skin-sam .yui-dt-resizer { width: 6px }
 .yui-skin-sam .yui-dt-mask {
     background-color: #000;
     opacity: .25;
     filter: alpha(opacity=25);
+}
 .yui-skin-sam .yui-dt-message { background-color: #FFF }
 .yui-skin-sam .yui-dt-scrollable table { border: 0 }
 .yui-skin-sam .yui-dt-scrollable .yui-dt-hd {
     border-left: 1px solid #7f7f7f;
     border-top: 1px solid #7f7f7f;
     border-right: 1px solid #7f7f7f;
+}
 .yui-skin-sam .yui-dt-scrollable .yui-dt-bd {
     border-left: 1px solid #7f7f7f;
     border-bottom: 1px solid #7f7f7f;
     border-right: 1px solid #7f7f7f;
     background-color: #FFF;
+}
 .yui-skin-sam .yui-dt-scrollable .yui-dt-data tr.yui-dt-last td { border-bottom: 1px solid #7f7f7f }
 .yui-skin-sam th.yui-dt-asc,
 .yui-skin-sam th.yui-dt-desc { background: url(../images/sprite.png) repeat-x 0 -100px }
 .yui-skin-sam th.yui-dt-sortable .yui-dt-label { margin-right: 10px }
 .yui-skin-sam th.yui-dt-asc .yui-dt-liner { background: url(../images/dt-arrow-up.png) no-repeat right }
 .yui-skin-sam th.yui-dt-desc .yui-dt-liner { background: url(../images/dt-arrow-dn.png) no-repeat right }
 .yui-skin-sam th.yui-dt-asc .yui-dt-liner:after {
     font-family: "kallithea";
     content: "\e810";           /* triangle-up */
+}
 .yui-skin-sam th.yui-dt-desc .yui-dt-liner:after {
     font-family: "kallithea";
     content: "\e80d";           /* triangle-down */
+}
 tbody .yui-dt-editable { cursor: pointer }
 .yui-dt-editor {
     text-align: left;
     background-color: #f2f2f2;
     border: 1px solid #808080;
     padding: 6px;
+}
 .yui-dt-editor label {
     padding-left: 4px;
     padding-right: 6px;
+}
 .yui-dt-editor .yui-dt-button {
     padding-top: 6px;
     text-align: right;
+}
 .yui-dt-editor .yui-dt-button button {
     background: url(../images/sprite.png) repeat-x 0 0;
     border: 1px solid #999;
     width: 4em;
     height: 1.8em;
     margin-left: 6px;
+}
 .yui-dt-editor .yui-dt-button button.yui-dt-default {
     background: url(../images/sprite.png) repeat-x 0 -1400px;
     background-color: #5584e0;
     border: 1px solid #304369;
     color: #FFF;
+}
 .yui-dt-editor .yui-dt-button button:hover {
     background: url(../images/sprite.png) repeat-x 0 -1300px;
     color: #000;
+}
 .yui-dt-editor .yui-dt-button button:active {
     background: url(../images/sprite.png) repeat-x 0 -1700px;
     color: #000;
+}
 .yui-skin-sam tr.yui-dt-even { background-color: #FFF }
 .yui-skin-sam tr.yui-dt-odd { background-color: #edf5ff }
 .yui-skin-sam tr.yui-dt-even td.yui-dt-asc,
 .yui-skin-sam tr.yui-dt-even td.yui-dt-desc { background-color: #edf5ff }
 .yui-skin-sam tr.yui-dt-odd td.yui-dt-asc,
 .yui-skin-sam tr.yui-dt-odd td.yui-dt-desc { background-color: #dbeaff }
 .yui-skin-sam .yui-dt-list tr.yui-dt-even { background-color: #FFF }
 .yui-skin-sam .yui-dt-list tr.yui-dt-odd { background-color: #FFF }
 .yui-skin-sam .yui-dt-list tr.yui-dt-even td.yui-dt-asc,
 .yui-skin-sam .yui-dt-list tr.yui-dt-even td.yui-dt-desc { background-color: #edf5ff }
 .yui-skin-sam .yui-dt-list tr.yui-dt-odd td.yui-dt-asc,
 .yui-skin-sam .yui-dt-list tr.yui-dt-odd td.yui-dt-desc { background-color: #edf5ff }
 .yui-skin-sam th.yui-dt-highlighted,
 .yui-skin-sam th.yui-dt-highlighted a { background-color: #b2d2ff }
 .yui-skin-sam tr.yui-dt-highlighted,
 .yui-skin-sam tr.yui-dt-highlighted td.yui-dt-asc,
 .yui-skin-sam tr.yui-dt-highlighted td.yui-dt-desc,
 .yui-skin-sam tr.yui-dt-even td.yui-dt-highlighted,
 .yui-skin-sam tr.yui-dt-odd td.yui-dt-highlighted {
     cursor: pointer;
     background-color: #b2d2ff;
+}
 .yui-skin-sam .yui-dt-list th.yui-dt-highlighted,
 .yui-skin-sam .yui-dt-list th.yui-dt-highlighted a { background-color: #b2d2ff }
 .yui-skin-sam .yui-dt-list tr.yui-dt-highlighted,
 .yui-skin-sam .yui-dt-list tr.yui-dt-highlighted td.yui-dt-asc,
 .yui-skin-sam .yui-dt-list tr.yui-dt-highlighted td.yui-dt-desc,
 .yui-skin-sam .yui-dt-list tr.yui-dt-even td.yui-dt-highlighted,
 .yui-skin-sam .yui-dt-list tr.yui-dt-odd td.yui-dt-highlighted {
     cursor: pointer;
     background-color: #b2d2ff;
+}
 .yui-skin-sam th.yui-dt-selected,
 .yui-skin-sam th.yui-dt-selected a { background-color: #446cd7 }
 .yui-skin-sam tr.yui-dt-selected td,
 .yui-skin-sam tr.yui-dt-selected td.yui-dt-asc,
 .yui-skin-sam tr.yui-dt-selected td.yui-dt-desc {
     background-color: #426fd9;
     color: #FFF;
+}
 .yui-skin-sam tr.yui-dt-even td.yui-dt-selected,
 .yui-skin-sam tr.yui-dt-odd td.yui-dt-selected {
     background-color: #446cd7;
     color: #FFF;
+}
 .yui-skin-sam .yui-dt-list th.yui-dt-selected,
 .yui-skin-sam .yui-dt-list th.yui-dt-selected a { background-color: #446cd7 }
 .yui-skin-sam .yui-dt-list tr.yui-dt-selected td,
@@ @@ -1145,105 +1024,96 @@ tbody .yui-dt-editable { cursor: pointer @@
     padding: 5px 0;
     white-space: pre-wrap;
+}
 #content div.box div.expand {
     width: 110%;
     height: 14px;
     font-size: 10px;
     text-align: center;
     cursor: pointer;
     color: #666;
     background: -webkit-gradient(linear,0% 50%,100% 50%,color-stop(0%,rgba(255,255,255,0)),color-stop(100%,rgba(64,96,128,0.1)));
     background: -webkit-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1));
     background: -moz-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1));
     background: -o-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1));
     background: -ms-linear-gradient(top,rgba(255,255,255,0),rgba(64,96,128,0.1));
     background: linear-gradient(to bottom,rgba(255,255,255,0),rgba(64,96,128,0.1));
     display: none;
     overflow: hidden;
+}
 #content div.box div.expand .expandtext {
     background-color: #ffffff;
     padding: 2px;
     border-radius: 2px;
+}
 #content div.box div.message a {
     font-weight: 400 !important;
+}
 #content div.box div.message div.image {
     float: left;
     margin: 9px 0 0 5px;
     padding: 6px;
+}
 #content div.box div.message div.image img {
     vertical-align: middle;
     margin: 0;
+}
 #content div.box div.message div.text {
     float: left;
     margin: 0;
     padding: 9px 6px;
+}
 #content div.box div.message div.dismiss a {
     height: 16px;
     width: 16px;
     display: block;
     background: url("../images/icons/cross.png") no-repeat;
     margin: 15px 14px 0 0;
     padding: 0;
+}
 #content div.box div.message div.text h1,
 #content div.box div.message div.text h2,
 #content div.box div.message div.text h3,
 #content div.box div.message div.text h4,
 #content div.box div.message div.text h5,
 #content div.box div.message div.text h6 {
     border: none;
     margin: 0;
     padding: 0;
+}
 #content div.box div.message div.text span {
     height: 1%;
     display: block;
     margin: 0;
     padding: 5px 0 0;
+}
 #content div.box div.message-error {
     height: 1%;
     clear: both;
     overflow: hidden;
     background: #FBE3E4;
     border: 1px solid #FBC2C4;
     color: #860006;
+}
 #content div.box div.message-error h6 {
     color: #860006;
+}
 #content div.box div.message-warning {
     height: 1%;
     clear: both;
     overflow: hidden;
     background: #FFF6BF;
     border: 1px solid #FFD324;
     color: #5f5200;
+}
 #content div.box div.message-warning h6 {
     color: #5f5200;
+}
 #content div.box div.message-notice {
     height: 1%;
     clear: both;
     overflow: hidden;
@@ @@ -1757,102 +1627,96 @@ div.form div.fields div.field div.button @@
 #content div.box div.traffic table {
     width: auto;
+}
 #content div.box div.traffic table td {
     background: transparent;
     border: none;
     padding: 2px 3px 3px;
+}
 #content div.box div.traffic table td.legendLabel {
     padding: 0 3px 2px;
+}
 #content div.box #summary {
     margin-right: 200px;
     min-height: 240px;
+}
 #summary-menu-stats {
     float: left;
     width: 180px;
     position: absolute;
     top: 0;
     right: 0;
+}
 #summary-menu-stats ul {
     margin: 0 10px;
     display: block;
     background-color: #f9f9f9;
     border: 1px solid #d1d1d1;
     border-radius: 4px;
+}
 #content #summary-menu-stats li {
     border-top: 1px solid #d1d1d1;
     padding: 0;
+}
 #content #summary-menu-stats li:hover {
     background: #f0f0f0;
+}
 #content #summary-menu-stats li:first-child {
     border-top: none;
+}
 #summary-menu-stats a.followers { background-image: url('../images/icons/heart.png')}
 #summary-menu-stats a.forks { background-image: url('../images/icons/arrow_divide.png')}
 #summary-menu-stats a.settings { background-image: url('../images/icons/cog_edit.png')}
 #summary-menu-stats a.feed { background-image: url('../images/icons/rss_16.png')}
 #summary-menu-stats a.repo-size { background-image: url('../images/icons/server.png')}
 #summary-menu-stats a {
     display: block;
     padding: 12px 10px;
     background-repeat: no-repeat;
     background-position: 10px 50%;
     padding-right: 10px;
+}
 #repo_size_2.loaded {
     margin-left: 30px;
     display: block;
     padding-right: 10px;
     padding-bottom: 7px;
+}
 #summary-menu-stats a:hover {
     text-decoration: none;
+}
 #summary-menu-stats a span {
     background-color: #DEDEDE;
     color: #888 !important;
     border-radius: 4px;
     padding: 2px 4px;
     font-size: 10px;
+}
 #summary .metatag {
     display: inline-block;
     padding: 3px 5px;
     margin-bottom: 3px;
     margin-right: 1px;
     border-radius: 5px;
+}
 #content div.box #summary p {
     margin-bottom: -5px;
     width: 600px;
     white-space: pre-wrap;
+}
 #content div.box #summary p:last-child {
     margin-bottom: 9px;
+}
 #content div.box #summary p:first-of-type {
     margin-top: 9px;
+}
@@ @@ -1936,98 +1800,103 @@ a.metatag[tag="license"]:hover { @@
     background-image: -khtml-gradient( linear, left top, left bottom, from(#577632), to(#577632));
     background-image: -moz-linear-gradient(top, #577632, #577632);
     background-image: -ms-linear-gradient( top, #577632, #577632);
     background-image: -webkit-gradient( linear, left top, left bottom, color-stop( 0%, #577632), color-stop( 100%, #577632));
     background-image: -webkit-linear-gradient( top, #577632, #577632));
     background-image: -o-linear-gradient( top, #577632, #577632));
     background-image: linear-gradient(to bottom, #577632, #577632);
     filter: progid : DXImageTransform.Microsoft.gradient ( startColorstr = '#577632', endColorstr = '#577632', GradientType = 0);
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     -webkit-border-radius: 4px 4px 4px 4px;
     -khtml-border-radius: 4px 4px 4px 4px;
     border-radius: 4px 4px 4px 4px;
+}
 #footer div#footer-inner p {
     padding: 15px 25px 15px 0;
     color: #FFF;
     font-weight: 700;
+}
 #footer div#footer-inner .footer-link {
     float: left;
     padding-left: 10px;
+}
 #footer div#footer-inner .footer-link a,
 #footer div#footer-inner .footer-link-right a {
     color: #FFF;
+}
 #login div.title {
     clear: both;
     overflow: hidden;
     position: relative;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: -khtml-gradient( linear, left top, left bottom, from(#577632), to(#577632));
     background-image: -moz-linear-gradient( top, #577632, #577632);
     background-image: -ms-linear-gradient( top, #577632, #577632);
     background-image: -webkit-gradient( linear, left top, left bottom, color-stop( 0%, #577632), color-stop( 100%, #577632));
     background-image: -webkit-linear-gradient( top, #577632, #577632));
     background-image: -o-linear-gradient( top, #577632, #577632));
     background-image: linear-gradient(to bottom, #577632, #577632);
     filter: progid : DXImageTransform.Microsoft.gradient ( startColorstr = '#577632', endColorstr = '#577632', GradientType = 0);
     margin: 0 auto;
     padding: 0;
+}
 #login div.inner .icon-lock {
     font-size: 80pt;
     color: #DDD;
+}
 #login div.inner {
-    background: #FFF url("../images/login.png") no-repeat top left;
     background: #FFF;
     border-top: none;
     border-bottom: none;
     margin: 0 auto;
     padding: 20px;
+}
 #login div.form div.fields div.field div.label {
     width: 173px;
     float: left;
     text-align: right;
     margin: 2px 10px 0 0;
     padding: 5px 0 0 5px;
+}
 #login div.form div.fields div.field div.input input {
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 11px;
     margin: 0;
     padding: 7px 7px 6px;
+}
 #login div.form div.fields div.buttons {
     clear: both;
     overflow: hidden;
     border-top: 1px solid #DDD;
     text-align: right;
     margin: 0;
     padding: 10px 0 0;
+}
 #login div.form div.links {
     clear: both;
     overflow: hidden;
     margin: 10px 0 0;
     padding: 0 0 2px;
+}
 .user-menu {
     margin: 0px !important;
     float: left;
+}
 .user-menu .container {
@@ @@ -2503,120 +2372,118 @@ h3.files_location { @@
     padding: 2px 0px 2px 0px;
+}
 /*new binary
 NEW_FILENODE = 1
 DEL_FILENODE = 2
 MOD_FILENODE = 3
 RENAMED_FILENODE = 4
 CHMOD_FILENODE = 5
 BIN_FILENODE = 6
 */
 .cs_files .changes .bin {
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .changes .bin.bin1 {
     background-color: #BBFFBB;
+}
 /*deleted binary*/
 .cs_files .changes .bin.bin2 {
     background-color: #FF8888;
+}
 /*mod binary*/
 .cs_files .changes .bin.bin3 {
     background-color: #DDDDDD;
+}
 /*rename file*/
 .cs_files .changes .bin.bin4 {
     background-color: #6D99FF;
+}
 /*rename file*/
 .cs_files .changes .bin.bin4 {
     background-color: #6D99FF;
+}
 /*chmod file*/
 .cs_files .changes .bin.bin5 {
     background-color: #6D99FF;
+}
 .cs_files .cs_added,
 .cs_files .cs_A {
     background: url("../images/icons/page_white_add.png") no-repeat scroll
 px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_changed,
 .cs_files .cs_M {
     background: url("../images/icons/page_white_edit.png") no-repeat scroll
 px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_removed,
 .cs_files .cs_D {
     background: url("../images/icons/page_white_delete.png") no-repeat
         scroll 3px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_renamed,
 .cs_files .cs_R {
     height: 16px;
     margin-top: 7px;
     text-align: left;
+}
 .table {
     position: relative;
+}
 #graph {
     position: relative;
     overflow: hidden;
+}
 #graph_nodes {
     position: absolute;
+}
 #graph_content,
 #graph .info_box,
 #graph .container_header {
     margin-left: 100px;
+}
 #graph_content {
     position: relative;
+}
 #graph .container_header {
     padding: 10px;
     height: 25px;
+}
 #graph_content #rev_range_container {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #rev_range_clear {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #changesets {
     table-layout: fixed;
     border-collapse: collapse;
     border-left: none;
     border-right: none;
     border-color: #cdcdcd;
@@ @@ -2771,116 +2638,120 @@ BIN_FILENODE = 6 @@
     float: left;
     line-height: 1em;
     margin-bottom: 1px;
     margin-right: 1px;
     padding: 1px 3px;
     font-size: 10px;
+}
 #graph_content .container .mid .message a:hover {
     text-decoration: none;
+}
 .revision-link {
     color: #3F6F9F;
     font-weight: bold !important;
+}
 .issue-tracker-link {
     color: #3F6F9F;
     font-weight: bold !important;
+}
 .changeset-status-container {
     padding-right: 5px;
     margin-top: 1px;
     float: right;
     height: 14px;
+}
 .code-header .changeset-status-container {
     float: left;
     padding: 2px 0px 0px 2px;
+}
 .changeset-status-container .changeset-status-lbl {
     float: left;
     padding: 3px 4px 0px 0px
+}
 .code-header .changeset-status-container .changeset-status-lbl {
     float: left;
     padding: 0px 4px 0px 0px;
+}
 .changeset-status-container .changeset-status-ico {
     float: left;
+}
 .code-header .changeset-status-container .changeset-status-ico,
 .container .changeset-status-ico {
     float: left;
+}
 /* changeset statuses (must be the same name as the status) */
 .changeset-status-not_reviewed {
     color: #bababa;
+}
 .changeset-status-approved {
     color: #81ba51;
+}
 .changeset-status-rejected {
     color: #cc392e;
+}
 .changeset-status-under_review {
     color: #ffc71e;
+}
 #graph_content .comments-cnt {
     color: rgb(136, 136, 136);
     padding: 5px 0;
+}
 #shortlog_data .comments-cnt {
     color: rgb(136, 136, 136);
     padding: 3px 0;
+}
 #pull_request_overview .comments-cnt a,
 #changeset_compare_view_content .comments-cnt a,
 #graph_content .comments-cnt a,
 #shortlog_data .comments-cnt a {
     background-image: url('../images/icons/comments.png');
     background-repeat: no-repeat;
     background-position: 100% 50%;
     padding: 5px 0;
+}
 .right .changes {
     clear: both;
+}
 .right .changes .changed_total {
     display: block;
     float: right;
     text-align: center;
     min-width: 45px;
     cursor: pointer;
     color: #444444;
     background: #FEA;
     -webkit-border-radius: 0px 0px 0px 6px;
     border-radius: 0px 0px 0px 6px;
     padding: 1px;
+}
 .right .changes .added,
 .changed, .removed {
     display: block;
     padding: 1px;
     color: #444444;
     float: right;
     text-align: center;
     min-width: 15px;
+}
 .right .changes .added {
     background: #CFC;
+}
 .right .changes .changed {
     background: #FEA;
+}
 .right .changes .removed {
     background: #FAA;
+}
 .right .merge {
     padding: 1px 3px 1px 3px;
     background-color: #fca062;
     font-size: 10px;
     color: #ffffff;
     text-transform: uppercase;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
@@ @@ -3040,152 +2911,154 @@ div.browserblock .browser-search { @@
+}
 div.browserblock #node_filter_box {
+}
 div.browserblock .search_activate {
     float: left
+}
 div.browserblock .add_node {
     float: left;
     padding-left: 5px;
+}
 div.browserblock .search_activate a:hover,
 div.browserblock .add_node a:hover {
     text-decoration: none !important;
+}
 div.browserblock .browser-body {
     background: #EEE;
     border-top: 1px solid #CCC;
+}
 table.code-browser {
     border-collapse: collapse;
     width: 100%;
+}
 table.code-browser tr {
     margin: 3px;
+}
 table.code-browser thead th {
     background-color: #EEE;
     height: 20px;
     font-size: 1.1em;
     font-weight: 700;
     text-align: left;
     padding-left: 10px;
+}
 table.code-browser tbody td {
     padding-left: 10px;
     height: 20px;
+}
 table.code-browser .browser-file {
     background: url("../images/icons/document_16.png") no-repeat scroll 3px;
     height: 16px;
-    padding-left: 20px;
+    padding-left: 5px;
     text-align: left;
+}
 .diffblock .changeset_header {
     height: 16px;
+}
 .diffblock .changeset_file {
     float: left;
+}
 .diffblock .diff-menu-wrapper {
     float: left;
+}
 .diffblock .diff-menu {
     position: absolute;
     background: none repeat scroll 0 0 #FFFFFF;
     border-color: #577632 #666666 #666666;
     border-right: 1px solid #666666;
     border-style: solid solid solid;
     border-width: 1px;
     box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2);
     margin-top: 5px;
     margin-left: 1px;
+}
 .diffblock .diff-actions {
     padding: 2px 0px 0px 2px;
     float: left;
+}
 .diffblock .diff-menu ul li {
     padding: 0px 0px 0px 0px !important;
+}
 .diffblock .diff-menu ul li a {
     display: block;
     padding: 3px 8px 3px 8px !important;
+}
 .diffblock .diff-menu ul li a:hover {
     text-decoration: none;
     background-color: #EEEEEE;
+}
 table.code-browser .browser-dir {
     background: url("../images/icons/folder_16.png") no-repeat scroll 3px;
     height: 16px;
-    padding-left: 20px;
+    padding-left: 5px;
     text-align: left;
+}
 table.code-browser .submodule-dir {
     background: url("../images/icons/disconnect.png") no-repeat scroll 3px;
     height: 16px;
-    padding-left: 20px;
+    padding-left: 5px;
     text-align: left;
+}
 /* add some padding to the right of the file, folder, or submodule icon and
 before the text */
 table.code-browser i[class^='icon-'] {
     padding-right: .3em;
+}
 .box .search {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 20px 10px;
+}
 .box .search div.search_path {
     background: none repeat scroll 0 0 #EEE;
     border: 1px solid #CCC;
     color: blue;
     margin-bottom: 10px;
     padding: 10px 0;
+}
 .box .search div.search_path div.link {
     font-weight: 700;
     margin-left: 25px;
+}
 .box .search div.search_path div.link a {
     color: #577632;
     cursor: pointer;
     text-decoration: none;
+}
 #path_unlock {
     color: red;
     font-size: 1.2em;
     padding-left: 4px;
+}
 .info_box span {
     margin-left: 3px;
     margin-right: 3px;
+}
 .info_box .rev {
     color: #577632;
     font-size: 1.6em;
     font-weight: bold;
     vertical-align: sub;
+}
 .info_box input#at_rev,
 .info_box input#size {
     background: #FFF;
@@ @@ -3290,218 +3163,108 @@ table.code-browser .submodule-dir { @@
+}
 .ac .yui-ac-shadow {
     position: absolute;
     width: 100%;
     background: #000;
     opacity: .10;
     filter: alpha(opacity = 10);
     z-index: 9049;
     margin: .3em;
+}
 .ac .yui-ac-content ul {
     width: 100%;
     margin: 0;
     padding: 0;
     z-index: 9050;
+}
 .ac .yui-ac-content li {
     cursor: default;
     white-space: nowrap;
     margin: 0;
     padding: 2px 5px;
     height: 18px;
     z-index: 9050;
     display: block;
     width: auto !important;
+}
 .ac .yui-ac-content li .ac-container-wrap {
     width: auto;
+}
 .ac .yui-ac-content li.yui-ac-prehighlight {
     background: #B3D4FF;
     z-index: 9050;
+}
 .ac .yui-ac-content li.yui-ac-highlight {
     background: #556CB5;
     color: #FFF;
     z-index: 9050;
+}
 .ac .yui-ac-bd {
     z-index: 9050;
+}
 .reposize {
     background: url("../images/icons/server.png") no-repeat scroll 3px;
     height: 16px;
     width: 20px;
     cursor: pointer;
     display: block;
     float: right;
     margin-top: 2px;
+}
 #repo_size {
     display: block;
     margin-top: 4px;
     color: #666;
     float: right;
+}
 .locking_locked {
     background: #FFF url("../images/icons/block_16.png") no-repeat scroll 3px;
     height: 16px;
     width: 20px;
     cursor: pointer;
     display: block;
     float: right;
     margin-top: 2px;
+}
 .locking_unlocked {
     background: #FFF url("../images/icons/accept.png") no-repeat scroll 3px;
     height: 16px;
     width: 20px;
     cursor: pointer;
     display: block;
     float: right;
     margin-top: 2px;
+}
 .currently_following {
     padding-left: 10px;
     padding-bottom: 5px;
+}
 .add_icon {
     background: url("../images/icons/add.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .accept_icon {
     background: url("../images/icons/accept.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .edit_icon {
     background: url("../images/icons/application_form_edit.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .delete_icon {
     background: url("../images/icons/delete.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .refresh_icon {
     background: url("../images/icons/arrow_refresh.png") no-repeat scroll
 px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .pull_icon {
     background: url("../images/icons/connect.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 0px;
     text-align: left;
+}
 .rss_icon {
     background: url("../images/icons/rss_16.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 4px;
     text-align: left;
     font-size: 8px
+}
 .atom_icon {
     background: url("../images/icons/rss_16.png") no-repeat scroll 3px;
     padding-left: 20px;
     padding-top: 4px;
     text-align: left;
     font-size: 8px
+}
 .archive_icon {
     background: url("../images/icons/compress.png") no-repeat scroll 3px;
     padding-left: 20px;
     text-align: left;
     padding-top: 1px;
+}
 .start_following_icon {
     background: url("../images/icons/heart_add.png") no-repeat scroll 3px;
     padding-left: 20px;
     text-align: left;
     padding-top: 0px;
+}
 .stop_following_icon {
     background: url("../images/icons/heart_delete.png") no-repeat scroll 3px;
     padding-left: 20px;
     text-align: left;
     padding-top: 0px;
+}
 .action_button {
     border: 0;
     display: inline;
+}
 .action_button:hover {
     border: 0;
     text-decoration: underline;
     cursor: pointer;
+}
 #switch_repos {
     position: absolute;
     height: 25px;
     z-index: 1;
+}
 #switch_repos select {
     min-width: 150px;
     max-height: 250px;
     z-index: 1;
+}
 .breadcrumbs {
     border: medium none;
     color: #FFF;
     float: left;
     font-weight: 700;
     font-size: 14px;
     margin: 0;
     padding: 11px 0 11px 10px;
+}
 .breadcrumbs .hash {
     text-transform: none;
     color: #fff;
+}
 .breadcrumbs a {
     color: #FFF;
+}
 .flash_msg {
+}
 .flash_msg ul {
+}
@@ @@ -3562,105 +3325,96 @@ table.code-browser .submodule-dir { @@
 .flash_msg .alert-success a {
     text-decoration: underline;
     color: #FFF !important;
+}
 .flash_msg .alert-info {
     background-color: #339bb9;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9) );
     background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
     background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9) );
     background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
     background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
     background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0 );
     border-color: #339bb9 #339bb9 #22697d;
+}
 .flash_msg .alert-info a {
     text-decoration: underline;
+}
 .flash_msg .alert-error,
 .flash_msg .alert-warning,
 .flash_msg .alert-success,
 .flash_msg .alert-info {
     font-size: 12px;
     font-weight: 700;
     min-height: 14px;
     line-height: 14px;
     margin-bottom: 10px;
     margin-top: 0;
     display: block;
     overflow: auto;
     padding: 6px 10px 6px 10px;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
     position: relative;
     color: #FFF;
     border-width: 1px;
     border-style: solid;
     -webkit-border-radius: 4px;
     border-radius: 4px;
     -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
     box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+}
 #msg_close {
     background: transparent url("../images/cross_grey_small.png") no-repeat scroll 0 0;
     cursor: pointer;
     height: 16px;
     position: absolute;
     right: 5px;
     top: 5px;
     width: 16px;
+}
 div#legend_data {
     padding-left: 10px;
+}
 div#legend_container table {
     border: none !important;
+}
 div#legend_container table,
 div#legend_choices table {
     width: auto !important;
+}
 table#permissions_manage {
     width: 0 !important;
+}
 table#permissions_manage span.private_repo_msg {
     font-size: 0.8em;
     opacity: 0.6;
+}
 table#permissions_manage td.private_repo_msg {
     font-size: 0.8em;
+}
 table#permissions_manage tr#add_perm_input td {
     vertical-align: middle;
+}
 div.gravatar {
     background-color: #FFF;
     float: left;
     margin-right: 0.7em;
     padding: 1px 1px 1px 1px;
     line-height: 0;
     -webkit-border-radius: 3px;
     -khtml-border-radius: 3px;
     border-radius: 3px;
+}
 div.gravatar img {
     -webkit-border-radius: 2px;
     -khtml-border-radius: 2px;
     border-radius: 2px;
+}
 #header, #content, #footer {
     min-width: 978px;
+}
@@ @@ -3687,109 +3441,96 @@ div.gravatar img { @@
     background-color: #DADADA;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#F4F4F4),to(#DADADA) );
     background-image: -moz-linear-gradient(top, #F4F4F4, #DADADA);
     background-image: -ms-linear-gradient(top, #F4F4F4, #DADADA);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #F4F4F4),color-stop(100%, #DADADA) );
     background-image: -webkit-linear-gradient(top, #F4F4F4, #DADADA) );
     background-image: -o-linear-gradient(top, #F4F4F4, #DADADA) );
     background-image: linear-gradient(to bottom, #F4F4F4, #DADADA);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#F4F4F4', endColorstr='#DADADA', GradientType=0);
     border-top: 1px solid #DDD;
     border-left: 1px solid #c6c6c6;
     border-right: 1px solid #DDD;
     border-bottom: 1px solid #c6c6c6;
     outline: none;
     margin: 0px 3px 3px 0px;
     -webkit-border-radius: 4px 4px 4px 4px !important;
     -khtml-border-radius: 4px 4px 4px 4px !important;
     border-radius: 4px 4px 4px 4px !important;
     cursor: pointer !important;
     padding: 3px 3px 3px 3px;
     display: inline-block;
+}
 ul.nav-stacked {
     margin: 20px;
     color: #393939;
     font-weight: 700;
+}
 ul.nav-stacked a {
     color: inherit;
+}
 /* make .btn inputs and buttons and divs look the same */
 button.btn,
 input.btn {
     font-family: inherit;
     font-size: inherit;
     line-height: inherit;
+}
 .btn::-moz-focus-inner {
     border: 0;
     padding: 0;
+}
 /* make .btn inputs and buttons and divs look the same */
 button.btn,
 input.btn {
     font-family: inherit;
     font-size: inherit;
     line-height: inherit;
+}
 .btn::-moz-focus-inner {
     border: 0;
     padding: 0;
+}
 .btn.badge {
     cursor: default !important;
+}
 .btn.disabled {
     color: #999;
+}
 .btn.btn-danger.disabled {
     color: #eee;
     background-color: #c77;
     border-color: #b66
+}
 .btn.btn-small {
     padding: 2px 6px;
+}
 .btn.btn-mini {
     padding: 0px 4px;
+}
 .btn:focus {
     outline: none;
+}
 .btn:hover {
     text-decoration: none;
     color: #515151;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25), 0 0 3px #FFFFFF !important;
+}
 .btn.badge:hover {
     box-shadow: none !important;
+}
 .btn.disabled:hover {
     background-position: 0;
     color: #999;
     text-decoration: none;
     box-shadow: none !important;
+}
 .btn.red {
     color: #fff;
     background-color: #c43c35;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
     background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
     background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
@@ @@ -4038,166 +3779,128 @@ div#legend_data, div#legend_container, d @@
 #content div.box div.form div.fields div.field div.radios {
     margin: 0 0 0 200px;
     padding: 0;
+}
 #content div.box div.form div.fields div.field div.select a:hover,
 #content div.box div.form div.fields div.field div.select a.ui-selectmenu:hover,
 #content div.box div.action a:hover {
     color: #000;
     text-decoration: none;
+}
 #content div.box div.form div.fields div.field div.select a.ui-selectmenu-focus,
 #content div.box div.action a.ui-selectmenu-focus {
     border: 1px solid #666;
+}
 #content div.box div.form div.fields div.field div.checkboxes div.checkbox,
 #content div.box div.form div.fields div.field div.radios div.radio {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 8px 0 2px;
+}
 #content div.box div.form div.fields div.field div.checkboxes div.checkbox input,
 #content div.box div.form div.fields div.field div.radios div.radio input {
     float: left;
     margin: 0;
+}
 #content div.box div.form div.fields div.field div.checkboxes div.checkbox label,
 #content div.box div.form div.fields div.field div.radios div.radio label {
     height: 1%;
     display: block;
     float: left;
     margin: 2px 0 0 4px;
+}
 div.form div.fields div.field div.button input,
 #content div.box div.form div.fields div.buttons input
 div.form div.fields div.buttons input,
 #content div.box div.action div.button input {
     font-size: 11px;
     font-weight: 700;
     margin: 0;
+}
 input.ui-button {
     background: #e5e3e3 url("../images/button.png") repeat-x;
     border-top: 1px solid #DDD;
     border-left: 1px solid #c6c6c6;
     border-right: 1px solid #DDD;
     border-bottom: 1px solid #c6c6c6;
     color: #515151 !important;
     outline: none;
     margin: 0;
     padding: 6px 12px;
     -webkit-border-radius: 4px 4px 4px 4px;
     -khtml-border-radius: 4px 4px 4px 4px;
     border-radius: 4px 4px 4px 4px;
     box-shadow: 0 1px 0 #ececec;
     cursor: pointer;
+}
 input.ui-button:hover {
     background: #b4b4b4 url("../images/button_selected.png") repeat-x;
     border-top: 1px solid #ccc;
     border-left: 1px solid #bebebe;
     border-right: 1px solid #b1b1b1;
     border-bottom: 1px solid #afafaf;
+}
 div.form div.fields div.field div.highlight,
 #content div.box div.form div.fields div.buttons div.highlight {
     display: inline;
+}
 #content div.box div.form div.fields div.buttons,
 div.form div.fields div.buttons {
     margin: 10px 0 0 200px;
     padding: 0;
+}
 #content div.box-left div.form div.fields div.buttons,
 #content div.box-right div.form div.fields div.buttons,
 div.box-left div.form div.fields div.buttons,
 div.box-right div.form div.fields div.buttons {
     margin: 10px 0 0;
+}
 #content div.box table td.user,
 #content div.box table td.address {
     width: 10%;
     text-align: center;
+}
 #content div.box div.action div.button,
 #login div.form div.fields div.field div.input div.link,
 #register div.form div.fields div.field div.input div.link {
     text-align: right;
     margin: 6px 0 0;
     padding: 0;
+}
 #content div.box div.action div.button input.ui-state-hover,
 #login div.form div.fields div.buttons input.ui-state-hover,
 #register div.form div.fields div.buttons input.ui-state-hover {
     background: #b4b4b4 url("../images/button_selected.png") repeat-x;
     border-top: 1px solid #ccc;
     border-left: 1px solid #bebebe;
     border-right: 1px solid #b1b1b1;
     border-bottom: 1px solid #afafaf;
     color: #515151;
     margin: 0;
     padding: 6px 12px;
+}
 #content div.box div.pagination div.results,
 #content div.box div.pagination-wh div.results {
     text-align: left;
     float: left;
     margin: 0;
     padding: 0;
+}
 #content div.box div.pagination div.results span,
 #content div.box div.pagination-wh div.results span {
     height: 1%;
     display: block;
     float: left;
     background: #ebebeb url("../images/pager.png") repeat-x;
     border-top: 1px solid #dedede;
     border-left: 1px solid #cfcfcf;
     border-right: 1px solid #c4c4c4;
     border-bottom: 1px solid #c4c4c4;
     color: #4A4A4A;
     font-weight: 700;
     margin: 0;
     padding: 6px 8px;
+}
 #content div.box div.pagination ul.pager li.disabled,
 #content div.box div.pagination-wh a.disabled {
     color: #B4B4B4;
     padding: 6px;
+}
 #login, #register {
     width: 520px;
     margin: 10% auto 0;
     padding: 0;
+}
 #login div.color,
 #register div.color {
     clear: both;
     overflow: hidden;
     background: #FFF;
     margin: 10px auto 0;
     padding: 3px 3px 3px 0;
+}
 #login div.color a,
 #register div.color a {
     width: 20px;
@@ @@ -5192,102 +4895,111 @@ table.code-difftable .lineno a { @@
     display: block;
     width: 30px;
+}
 table.code-difftable .lineno-inline {
     background: none repeat scroll 0 0 #FFF !important;
     padding-left: 2px;
     padding-right: 2px;
     text-align: right;
     width: 30px;
     -moz-user-select: none;
     -webkit-user-select: none;
+}
 /** CODE **/
 table.code-difftable .code {
     display: block;
     width: 100%;
+}
 table.code-difftable .code td {
     margin: 0;
     padding: 0;
+}
 table.code-difftable .code pre {
     margin: 0;
     padding: 0;
     min-height: 17px;
     line-height: 17px;
     white-space: pre-wrap;
+}
 .add-bubble {
     display: none;
     float: left;
     width: 0px;
     height: 0px;
+}
 tr.line.add td.code:hover .add-bubble,
 tr.line.del td.code:hover .add-bubble,
 tr.line.unmod td.code:hover .add-bubble {
     display: inherit;
+}
 .add-bubble div {
     position: relative;
     left: -32px;
     width: 32px;
     top: -8px;
     height: 32px;
     background: url("../images/icons/comment_add.png") no-repeat 100% 50%;
     cursor: pointer;
+}
 .add-bubble div:before {
     font-size: 14px;
     color: #577632;
     font-family: "kallithea";
     content: '\e80c';
+}
 div.comment:target>.comment-wrapp {
     border: solid 2px #ee0 !important;
+}
 .lineno:target a {
     border: solid 2px #ee0 !important;
     margin: -2px;
+}
 .btn-image-diff-show,
 .btn-image-diff-swap {
     margin: 5px;
+}
 .img-diff {
     max-width: 45%;
     height: auto;
     margin: 5px;
     /* http://lea.verou.me/demos/css3-patterns.html */
     background-image:
         linear-gradient(45deg, #888 25%, transparent 25%, transparent),
         linear-gradient(-45deg, #888 25%, transparent 25%, transparent),
         linear-gradient(45deg, transparent 75%, #888 75%),
         linear-gradient(-45deg, transparent 75%, #888 75%);
     background-size: 10px 10px;
     background-color: #999;
+}
 .img-preview {
     max-width: 100%;
     height: auto;
     margin: 5px;
+}
 div.prev-next-comment div.prev-comment,
 div.prev-next-comment div.next-comment {
     display: inline-block;
     min-width: 150px;
     margin: 3px 6px;
+}
 #help_kb {
     display: none;
+}
 .repo-switcher-dropdown .select2-result-label span.repo-icons {
     margin-left: -12px;
+}
 .icon-only-links i {
     color: white;
+}

kallithea/public/fontello/README-kallithea.txt

➞

Show inline comments

@@ new file 100644 @@
 Files mentioned here might have been edited or removed. Re-run the export from
 fontello by importing the config.json found in this same directory.
 Specifically, the ie7 and animation css files were not added to the repository.

kallithea/public/fontello/README.txt

➞

Show inline comments

@@ new file 100644 @@
 This webfont is generated by http://fontello.com open source project.
 ================================================================================
 Please, note, that you should obey original font licences, used to make this
 webfont pack. Details available in LICENSE.txt file.
 - Usually, it's enough to publish content of LICENSE.txt file somewhere on your
   site in "About" section.
 - If your project is open-source, usually, it will be ok to make LICENSE.txt
   file publically available in your repository.
 - Fonts, used in Fontello, don't require to make clickable links on your site.
   But any kind of additional authors crediting is welcome.
 ================================================================================
 Comments on archive content
 ---------------------------
 - /font/* - fonts in different formats
 - /css/*  - different kinds of css, for all situations. Should be ok with
   twitter bootstrap. Also, you can skip <i> style and assign icon classes
   directly to text elements, if you don't mind about IE7.
 - demo.html - demo file, to show your webfont content
 - LICENSE.txt - license info about source fonts, used to build your one.
 - config.json - keeps your settings. You can import it back to fontello anytime,
   to continue your work
 Why so many CSS files ?
 -----------------------
 Because we like to fit all your needs :)
 - basic file, <your_font_name>.css - is usually enougth, in contains @font-face
   and character codes definition
 - *-ie7.css - if you need IE7 support, but still don't wish to put char codes
   directly into html
 - *-codes.css and *-ie7-codes.css - if you like to use your own @font-face
   rules, but still wish to benefit of css generation. That can be very
   convenient for automated assets build systems. When you need to update font -
   no needs to manually edit files, just override old version with archive
   content. See fontello source codes for example.
 - *-embedded.css - basic css file, but with embedded WOFF font, to avoid
   CORS issues in Firefox and IE9+, when fonts are hosted on the separate domain.
   We strongly recommend to resolve this issue by `Access-Control-Allow-Origin`
   server headers. But if you ok with dirty hack - this file is for you. Note,
   that data url moved to separate @font-face to avoid problems with <IE9, when
   string is too long.
 - animate.css - use it to get ideas about spinner rotation animation.
 Attention for server setup
 --------------------------
 You MUST setup server to reply with proper `mime-types` for font files. In other
 case, some browsers will fail to show fonts.
 Usually, `apache` already has necessary settings, but `nginx` and other
 webservers should be tuned. Here is list of mime types for our file extentions:
 - `application/vnd.ms-fontobject` - eot
 - `application/x-font-woff` - woff
 - `application/x-font-ttf` - ttf
 - `image/svg+xml` - svg

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)