kallithea Changeset - e77f5cd50f1f

Changeset - e77f5cd50f1f

Parent rev.

Child rev.

[Not reviewed]

default

0 6 0

Mads Kiilerich - 8 years ago 2017-06-25 18:28:32
mads@kiilerich.com

style: change some div to span to make it inline and look better without custom styling - especially around gravatars

6 files changed with 13 insertions and 23 deletions:

kallithea/lib/helpers.py

kallithea/public/css/style.css

kallithea/templates/admin/gists/index.html

kallithea/templates/admin/notifications/notifications_data.html

kallithea/templates/files/files_browser.html

kallithea/templates/journal/journal_data.html

0 comments (0 inline, 0 general)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -641,399 +641,399 @@ def action_parser(user_log, feed=False, @@
                         revs.append(rev)
                 else:
                     _rev = AttributeDict({
                         'short_id': rev[:12],
                         'raw_id': rev,
                         'message': '',
                         'op': _op,
                         'ref_name': _name
                     })
                     revs.append(_rev)
         cs_links = [" " + ', '.join(
             [lnk(rev, repo_name) for rev in revs[:revs_limit]]
         )]
         _op1, _name1 = _get_op(revs_ids[0])
         _op2, _name2 = _get_op(revs_ids[-1])
         _rev = '%s...%s' % (_name1, _name2)
         compare_view = (
             ' <div class="compare_view" data-toggle="tooltip" title="%s">'
             '<a href="%s">%s</a> </div>' % (
                 _('Show all combined changesets %s->%s') % (
                     revs_ids[0][:12], revs_ids[-1][:12]
                 ),
                 url('changeset_home', repo_name=repo_name,
                     revision=_rev
                 ),
                 _('Compare view')
+            )
+        )
         # if we have exactly one more than normally displayed
         # just display it, takes less space than displaying
         # "and 1 more revisions"
         if len(revs_ids) == revs_limit + 1:
             cs_links.append(", " + lnk(revs[revs_limit], repo_name))
         # hidden-by-default ones
         if len(revs_ids) > revs_limit + 1:
             uniq_id = revs_ids[0]
             html_tmpl = (
                 '<span> %s <a class="show_more" id="_%s" '
                 'href="#more">%s</a> %s</span>'
+            )
             if not feed:
                 cs_links.append(html_tmpl % (
                       _('and'),
                       uniq_id, _('%s more') % (len(revs_ids) - revs_limit),
                       _('revisions')
+                    )
+                )
             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():
         from kallithea.model.db import PullRequest
         pull_request_id = action_params
         nice_id = PullRequest.make_nice_id(pull_request_id)
         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') % nice_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-trashcan'),
     'user_created_repo':           (_('[created] repository'),
                                     None, 'icon-plus'),
     'user_created_fork':           (_('[created] repository as fork'),
                                     None, 'icon-fork'),
     'user_forked_repo':            (_('[forked] repository'),
                                     get_fork_name, 'icon-fork'),
     'user_updated_repo':           (_('[updated] repository'),
                                     None, 'icon-pencil'),
     'user_downloaded_archive':      (_('[downloaded] archive from repository'),
                                     get_archive_name, 'icon-download-cloud'),
     'admin_deleted_repo':          (_('[delete] repository'),
                                     None, 'icon-trashcan'),
     'admin_created_repo':          (_('[created] repository'),
                                     None, 'icon-plus'),
     'admin_forked_repo':           (_('[forked] repository'),
                                     None, 'icon-fork'),
     'admin_updated_repo':          (_('[updated] repository'),
                                     None, 'icon-pencil'),
     'admin_created_user':          (_('[created] user'),
                                     get_user_name, 'icon-user'),
     'admin_updated_user':          (_('[updated] user'),
                                     get_user_name, 'icon-user'),
     'admin_created_users_group':   (_('[created] user group'),
                                     get_users_group, 'icon-pencil'),
     'admin_updated_users_group':   (_('[updated] user group'),
                                     get_users_group, 'icon-pencil'),
     'user_commented_revision':     (_('[commented] on revision in repository'),
                                     get_cs_links, 'icon-comment'),
     'user_commented_pull_request': (_('[commented] on pull request for'),
                                     get_pull_request, 'icon-comment'),
     'user_closed_pull_request':    (_('[closed] pull request for'),
                                     get_pull_request, 'icon-ok'),
     'push':                        (_('[pushed] into'),
                                     get_cs_links, 'icon-move-up'),
     'push_local':                  (_('[committed via Kallithea] into repository'),
                                     get_cs_links, 'icon-pencil'),
     'push_remote':                 (_('[pulled from remote] into repository'),
                                     get_cs_links, 'icon-move-up'),
     'pull':                        (_('[pulled] from'),
                                     None, 'icon-move-down'),
     'started_following_repo':      (_('[started following] repository'),
                                     None, 'icon-heart'),
     'stopped_following_repo':      (_('[stopped following] repository'),
                                     None, 'icon-heart-empty'),
+    }
     action_str = action_map.get(action, action)
     if feed:
         action = action_str[0].replace('[', '').replace(']', '')
     else:
         action = action_str[0] \
             .replace('[', '<b>') \
             .replace(']', '</b>')
     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
         ico = action_map.get(action, ['', '', ''])[2]
         html = """<i class="%s"></i>""" % ico
         return literal(html)
     # 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, \
     HasRepoPermissionLevel, HasRepoGroupPermissionLevel
 #==============================================================================
 # GRAVATAR URL
 #==============================================================================
 def gravatar_div(email_address, cls='', size=30, **div_attributes):
-    """Return an html literal with a div around a gravatar if they are enabled.
+    """Return an html literal with a span around a gravatar if they are enabled.
     Extra keyword parameters starting with 'div_' will get the prefix removed
     and '_' changed to '-' and be used as attributes on the div. The default
     class is 'gravatar'.
     """
     from tg import tmpl_context as c
     if not c.visual.use_gravatar:
         return ''
     if 'div_class' not in div_attributes:
         div_attributes['div_class'] = "gravatar"
     attributes = []
     for k, v in sorted(div_attributes.items()):
         assert k.startswith('div_'), k
         attributes.append(' %s="%s"' % (k[4:].replace('_', '-'), escape(v)))
-    return literal("""<div%s>%s</div>""" %
+    return literal("""<span%s>%s</span>""" %
                    (''.join(attributes),
                     gravatar(email_address, cls=cls, size=size)))
 def gravatar(email_address, cls='', size=30):
     """return html element of the gravatar
     This method will return an <img> with the resolution double the size (for
     retina screens) of the image. If the url returned from gravatar_url is
     empty then we fallback to using an icon.
     """
     from tg import tmpl_context as c
     if not c.visual.use_gravatar:
         return ''
     src = gravatar_url(email_address, size * 2)
     if src:
         # here it makes sense to use style="width: ..." (instead of, say, a
         # stylesheet) because we using this to generate a high-res (retina) size
         html = ('<img alt="" class="{cls}" style="width: {size}px; height: {size}px" src="{src}"/>'
             .format(cls=cls, size=size, src=src))
     else:
         # if src is empty then there was no gravatar, so we use a font icon
         html = ("""<i class="icon-user {cls}" style="font-size: {size}px;"></i>"""
             .format(cls=cls, size=size, src=src))
     return literal(html)
 def gravatar_url(email_address, size=30, default=''):
     # doh, we need to re-import those to mock it later
     from kallithea.config.routing import url
     from kallithea.model.db import User
     from tg import tmpl_context as c
     if not c.visual.use_gravatar:
         return ""
     _def = 'anonymous@kallithea-scm.org'  # default gravatar
     email_address = email_address or _def
     if email_address == _def:
         return default
     parsed_url = urlparse.urlparse(url.current(qualified=True))
     url = (c.visual.gravatar_url or User.DEFAULT_GRAVATAR_URL ) \
                .replace('{email}', email_address) \
                .replace('{md5email}', hashlib.md5(safe_str(email_address).lower()).hexdigest()) \
                .replace('{netloc}', parsed_url.netloc) \
                .replace('{scheme}', parsed_url.scheme) \
                .replace('{size}', safe_str(size))
     return url
 def changed_tooltip(nodes):
     """
     Generates a html string for changed nodes in changeset page.
     It limits the output to 30 entries
     :param nodes: LazyNodesGenerator
     """
     if nodes:
         pref = ': <br/> '
         suf = ''
         if len(nodes) > 30:
             suf = '<br/>' + _(' and %s more') % (len(nodes) - 30)
         return literal(pref + '<br/> '.join([safe_unicode(x.path)
                                              for x in nodes[:30]]) + suf)
     else:
         return ': ' + _('No files')
 def fancy_file_stats(stats):
     """
     Displays a fancy two colored bar for number of added/deleted
     lines of code on file
     :param stats: two element list of added/deleted lines of code
     """
     from kallithea.lib.diffs import NEW_FILENODE, DEL_FILENODE, \
         MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE
     a, d = stats['added'], stats['deleted']
     width = 100
     if stats['binary']:
         #binary mode
         lbl = ''
         bin_op = 1
         if BIN_FILENODE in stats['ops']:
             lbl = 'bin+'
         if NEW_FILENODE in stats['ops']:
             lbl += _('new file')
             bin_op = NEW_FILENODE
         elif MOD_FILENODE in stats['ops']:
             lbl += _('mod')
             bin_op = MOD_FILENODE
         elif DEL_FILENODE in stats['ops']:
             lbl += _('del')
             bin_op = DEL_FILENODE
         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 progress-bar" style="width:100%%">%s</div>' % (bin_op, lbl)
         b_a = '<div class="bin bin1" style="width:0%"></div>'
         return literal('<div style="width:%spx" class="progress">%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 progress-bar" style="width:%s%%">%s</div>' % (
         a_p, a_v
+    )
     d_d = '<div class="deleted progress-bar" style="width:%s%%">%s</div>' % (
         d_p, d_v
+    )
     return literal('<div class="pull-right progress" style="width:%spx">%s%s</div>' % (width, d_a, d_d))
 _URLIFY_RE = re.compile(r'''
 # URL markup
 (?P<url>%s) |
 # @mention markup
 (?P<mention>%s) |
 # Changeset hash markup
 (?<!\w|[-_])
   (?P<hash>[0-9a-f]{12,40})
 (?!\w|[-_]) |
 # Markup of *bold text*
 (?:
   (?:^|(?<=\s))
   (?P<bold> [*] (?!\s) [^*\n]* (?<!\s) [*] )
   (?![*\w])
 ) |
 # "Stylize" markup
 \[see\ \=&gt;\ *(?P<seen>[a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\] |
 \[license\ \=&gt;\ *(?P<license>[a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\] |
 \[(?P<tagtype>requires|recommends|conflicts|base)\ \=&gt;\ *(?P<tagvalue>[a-zA-Z0-9\-\/]*)\] |
 \[(?:lang|language)\ \=&gt;\ *(?P<lang>[a-zA-Z\-\/\#\+]*)\] |
 \[(?P<tag>[a-z]+)\]
 ''' % (url_re.pattern, MENTIONS_REGEX.pattern),
     re.VERBOSE | re.MULTILINE | re.IGNORECASE)
 def urlify_text(s, repo_name=None, link_=None, truncate=None, stylize=False, truncatef=truncate):
     """
     Parses given text message and make literal html with markup.
     The text will be truncated to the specified length.
     Hashes are turned into changeset links to specified repository.
     URLs links to what they say.
     Issues are linked to given issue-server.
     If link_ is provided, all text not already linking somewhere will link there.
     """
     def _replace(match_obj):
         url = match_obj.group('url')
         if url is not None:
             return '<a href="%(url)s">%(url)s</a>' % {'url': url}
         mention = match_obj.group('mention')
         if mention is not None:
             return '<b>%s</b>' % mention
         hash_ = match_obj.group('hash')
         if hash_ is not None and repo_name is not None:
             from kallithea.config.routing import url  # doh, we need to re-import url to mock it later
             return '<a class="revision-link" href="%(url)s">%(hash)s</a>' % {
                  'url': url('changeset_home', repo_name=repo_name, revision=hash_),
                  'hash': hash_,

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -976,392 +976,384 @@ a.metatag[data-tag="license"]:hover { @@
+}
 .user-menu .gravatar {
     margin: 0px 0px 0px 0px;
     cursor: pointer;
+}
 .user-menu .gravatar.enabled {
     background-color: #FDF784 !important;
+}
 .user-menu .gravatar:hover {
     background-color: #FDF784 !important;
+}
 #quick_login {
     width: 330px;
     min-height: 110px;
     padding: 0;
     position: absolute;
     right: 0;
     color: #fff;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
     z-index: 999;
     border-radius: 0px 0px 4px 4px;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
     overflow: hidden;
+}
 #quick_login .form {
     margin: 15px;
+}
 #quick_login h4 {
     color: #fff;
     margin-bottom: 10px;
+}
 #quick_login input#username,
 #quick_login input#password {
     display: block;
     margin: 5px 0 10px;
+}
 #quick_login .password_forgotten a,
 #quick_login .register a {
     padding: 0 !important;
     line-height: 25px !important;
     float: left;
     clear: both;
+}
 #quick_login .submit {
     float: right;
+}
 #quick_login .submit input#sign_in {
     margin-top: 5px;
+}
 #quick_login > .pull-left {
     width: 170px;
+}
 #quick_login > .pull-right {
     width: 140px;
+}
 #quick_login .full_name {
     color: #FFFFFF;
     font-weight: bold;
     padding: 3px 3px 3px 15px;
+}
 #quick_login .big_gravatar {
     padding: 15px 0px 0px 15px;
+}
 #quick_login .notifications {
     padding: 2px 0px 0px 15px;
     color: #FFFFFF;
     font-weight: bold;
     line-height: 10px !important;
+}
 #quick_login .notifications a,
 #quick_login .unread a {
     color: #FFFFFF;
     display: block;
     padding: 0px !important;
+}
 #quick_login .notifications a:hover,
 #quick_login .unread a:hover {
     background-color: inherit !important;
+}
 #quick_login .email,
 #quick_login .unread {
     color: #FFFFFF;
     padding: 3px 3px 3px 15px;
+}
 #quick_login .links .logout {
+}
 #quick_login div.form div.form-horizontal {
     padding-top: 2px;
     padding-left: 10px;
+}
 #quick_login div.form div.form-horizontal div.form-group {
     padding: 5px;
+}
 #quick_login div.form div.form-horizontal div.form-group > label {
     color: #fff;
     padding-bottom: 3px;
+}
 #quick_login div.form div.form-horizontal div.form-group > div input {
     width: 236px;
     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: 5px 7px 4px;
+}
 #quick_login div.form div.form-horizontal div.buttons {
     clear: both;
     overflow: hidden;
     text-align: right;
     margin: 0;
     padding: 5px 14px 0px 5px;
+}
 #quick_login div.form div.links {
     clear: both;
     overflow: hidden;
     margin: 10px 0 0;
     padding: 0 0 2px;
+}
 #quick_login ol.links {
     display: block;
     font-weight: bold;
     list-style: none outside none;
     text-align: right;
+}
 #quick_login ol.links li {
     line-height: 27px;
     margin: 0;
     padding: 0;
     color: #fff;
     display: block;
     float: none !important;
+}
 #quick_login ol.links li a {
     color: #fff;
     display: block;
     padding: 2px;
+}
 #quick_login ol.links li a:HOVER {
     background-color: inherit !important;
+}
 #register div.form div.form-horizontal div.form-group > label {
     width: 135px;
     float: left;
     text-align: right;
     margin: 2px 10px 0 0;
     padding: 5px 0 0 5px;
+}
 #register div.form div.form-horizontal div.form-group > div input {
     width: 300px;
+}
 #register div.form div.form-horizontal div.buttons {
     border-top: 1px solid #DDD;
     margin: 0;
     padding: 10px 0 0 145px;
+}
 #journal .journal_day {
     font-size: 15px;
     padding: 10px 0px;
     border-bottom: 2px solid #DDD;
     margin-left: 10px;
     margin-right: 10px;
+}
 #journal .journal_container {
     clear: both;
+}
 #journal .journal_action_container {
     padding-left: 18px;
+}
 #journal .journal_user {
     color: #747474;
     font-size: 14px;
     font-weight: bold;
     height: 30px;
+}
 #journal .journal_user.deleted {
     color: #747474;
     font-size: 14px;
     font-weight: normal;
     height: 30px;
     font-style: italic;
+}
 #journal .journal_icon {
     clear: both;
     float: left;
     padding-right: 4px;
     padding-top: 3px;
+}
 #journal .journal_action {
     padding-top: 4px;
     min-height: 2px;
     float: left
+}
 #journal .journal_action_params {
     clear: left;
     padding-left: 22px;
+}
 #journal .journal_repo {
     float: left;
     margin-left: 6px;
     padding-top: 3px;
+}
 #journal .date {
     clear: both;
     color: #777777;
     font-size: 11px;
     padding-left: 22px;
+}
 #journal .journal_repo .journal_repo_name {
     font-weight: bold;
     font-size: 1.1em;
+}
 #journal .compare_view {
     padding: 5px 0px 5px 0px;
     width: 95px;
+}
 .trending_language_tbl, .trending_language_tbl td {
     border: 0 !important;
     margin: 0 !important;
     padding: 0 !important;
+}
 .trending_language_tbl, .trending_language_tbl tr {
     border-spacing: 1px;
+}
 #lang_stats .progress-bar {
     background-color: #577632;
     min-width: 15px;
     text-decoration: none;
     border-top-right-radius: 8px;
     border-bottom-right-radius: 8px;
+}
 #lang_stats table td {
     border-bottom: none !important;
     padding: 1px 0 !important;
+}
 h3.files_location {
     font-size: 1.8em;
     font-weight: 700;
     border-bottom: none !important;
     margin: 10px 0 !important;
+}
 #files_data dl dt {
     float: left;
     width: 60px;
     margin: 0 !important;
     padding: 5px;
+}
 #files_data dl dd {
     margin: 0 !important;
     padding: 5px !important;
+}
 #files_data .codeblock #editor_container .error-message {
     color: red;
     padding: 10px 10px 10px 26px
+}
 .file_history {
     padding-top: 10px;
     font-size: 16px;
+}
 .file_author {
     float: left;
+}
 .file_author .item {
     float: left;
     padding: 5px;
     color: #888;
+}
 .changeset_id {
     color: #666666;
     margin-right: -3px;
+}
 .changeset-logical-index {
     color: #666666;
     font-style: italic;
     font-size: 85%;
     padding-right: 0.5em;
     text-align: right;
+}
 #changeset_content {
     border-left: 1px solid #CCC;
     border-right: 1px solid #CCC;
     border-bottom: 1px solid #CCC;
     padding: 5px;
+}
 #changeset_content .changeset_content_header {
     font-size: 1.2em;
     overflow: hidden;
+}
 #changeset_compare_view_content .compare_view_commits {
     width: auto !important;
+}
 #changeset_compare_view_content .compare_view_commits td {
     padding: 0px 0px 0px 12px !important;
+}
 #changeset_content .changeset_content_header .right {
     float: right;
     width: 20%;
     text-align: right;
+}
 #changeset_content .changeset_content_header .message {
     white-space: pre-wrap;
+}
 #changeset_content .changeset_content_header .message a:hover {
     text-decoration: none;
+}
 .cs_files .progress {
     margin-bottom: 0;
+}
 .cs_files .cur_cs {
     margin: 10px 2px;
     font-weight: bold;
+}
 .cs_files .node {
     float: left;
+}
 .cs_files .changes {
     float: right;
     color: #577632;
+}
 .cs_files .changes .added {
     color: inherit;
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .changes .deleted {

kallithea/templates/admin/gists/index.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%block name="title">
     %if c.show_private:
         ${_('Private Gists for User %s') % request.authuser.username}
     %elif c.show_public:
         ${_('Public Gists for User %s') % request.authuser.username}
     %else:
         ${_('Public Gists')}
     %endif
 </%block>
 <%def name="breadcrumbs_links()">
     %if c.show_private:
         ${_('Private Gists for User %s') % request.authuser.username}
     %elif c.show_public:
         ${_('Public Gists for User %s') % request.authuser.username}
     %else:
         ${_('Public Gists')}
     %endif
     - ${c.gists_pager.item_count}
 </%def>
 <%block name="header_menu">
     ${self.menu('gists')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         <div class="pull-left">
             ${self.breadcrumbs()}
         </div>
         %if request.authuser.username != 'default':
         <div class="pull-right">
              <a href="${h.url('new_gist')}" class="btn btn-success btn-xs"><i class="icon-plus"></i> ${_('Create New Gist')}</a>
         </div>
         %endif
     </div>
     <div class="panel-body">
       %if c.gists_pager.item_count>0:
         % for gist in c.gists_pager:
           <div class="gist-item clearfix">
             ${h.gravatar_div(gist.owner.email, size=28)}
-            <div title="${gist.owner.full_contact}" class="user">
+            <span title="${gist.owner.full_contact}" class="user">
                 <b>${h.person(gist.owner.full_contact)}</b> /
                 <b><a href="${h.url('gist',gist_id=gist.gist_access_id)}">gist: ${gist.gist_access_id}</a></b>
-            </div>
+            </span>
             <div>
                 ${_('Created')} ${h.age(gist.created_on)} /
                 <span class="text-muted">
                   %if gist.gist_expires == -1:
                    ${_('Expires')}: ${_('Never')}
                   %else:
                    ${_('Expires')}: ${h.age(h.time_to_datetime(gist.gist_expires))}
                   %endif
                 </span>
             </div>
             <div class="text-muted">${gist.gist_description}</div>
           </div>
         % endfor
         <ul class="pagination">
             ${c.gists_pager.pager(**request.GET.mixed())}
         </ul>
       %else:
         <div>${_('There are no gists yet')}</div>
       %endif
     </div>
 </div>
 </%def>

kallithea/templates/admin/notifications/notifications_data.html

➞

Show inline comments

 %if c.notifications:
 <div class="list-group">
 %for notification in c.notifications:
   <div id="notification_${notification.notification.notification_id}" class="list-group-item ${'' if notification.read else 'list-group-item-warning'} clearfix">
       ${h.gravatar_div(notification.notification.created_by_user.email, size=24)}
       <span class="pull-left">
         ${h.gravatar_div(notification.notification.created_by_user.email, size=24)}
         <a href="${url('notification', notification_id=notification.notification.notification_id)}">${notification.notification.description}</a>
       </span>
       <span class="pull-right">
         %if not notification.read:
           <span id="${notification.notification.notification_id}" class="btn btn-default btn-xs read-notification"><i class="icon-ok"></i>${_('Mark as read')}</span>
         %endif
         <span id="${notification.notification.notification_id}" class="btn btn-default btn-xs delete-notification"><i class="icon-minus-circled"></i>${_('Delete')}</span>
       </span>
   </div>
 %endfor
 </div>
 <ul class="pagination">
     ${c.notifications.pager(controller='admin/notifications', **request.GET.mixed())}
 </ul>
 %else:
     <div>${_('No notifications here yet')}</div>
 %endif

kallithea/templates/files/files_browser.html

➞

Show inline comments

 <%def name="file_class(node)">
     %if node.is_file():
         <%return "browser-file" %>
     %elif node.is_submodule():
         <%return "submodule-dir"%>
     %else:
         <%return "browser-dir"%>
     %endif
 </%def>
 <%def name="file_url(node, c)">
     %if node.is_submodule():
         <%return node.url or '#'%>
     %else:
         <%return h.url('files_home', repo_name=c.repo_name, revision=c.changeset.raw_id, f_path=h.safe_unicode(node.path))%>
     %endif
 </%def>
 <%def name="file_name(node)">
     <%
         c = "icon-folder-open"
         if node.is_file():
             c = "icon-doc"
         elif node.is_submodule():
             c = "icon-file-submodule"
     %>
     <%return h.literal('<i class="%s"></i><span>%s</span>' % (c, h.escape(node.name)))%>
 </%def>
 <div id="body" class="panel panel-default">
     <div class="panel-heading clearfix">
         <div class="browser-nav form-inline pull-left">
             ${h.form(h.url.current())}
             <div class="info_box">
               <div class="info_box_elem rev">${_('Revision')}</div>
               <div class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_prev}" title="${_('Previous revision')}"><i class="icon-left-open"></i></a></div>
               <div class="info_box_elem">${h.text('at_rev',value=c.changeset.revision,size=5,class_='form-control input-sm')}</div>
               <div class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_next}" title="${_('Next revision')}"><i class="icon-right-open"></i></a></div>
               <span class="info_box_elem rev">${_('Revision')}</span>
               <span class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_prev}" title="${_('Previous revision')}"><i class="icon-left-open"></i></a></span>
               <span class="info_box_elem">${h.text('at_rev',value=c.changeset.revision,size=5,class_='form-control input-sm')}</span>
               <span class="info_box_elem"><a class="btn btn-default btn-xs ypjax-link" href="${c.url_next}" title="${_('Next revision')}"><i class="icon-right-open"></i></a></span>
             </div>
             ${h.end_form()}
         </div>
         <div class="browser-branch form-inline pull-left">
             <label>
                 ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch,class_="form-control")}
                 ${_('Follow current branch')}
             </label>
         </div>
         <div id="search_activate_id" class="search_activate pull-left">
             <a class="btn btn-default btn-xs" id="filter_activate" href="#">${_('Search File List')}</a>
         </div>
         <div class="browser-search form-inline pull-left">
             <div>
                 <div id="node_filter_box_loading" style="display:none">${_('Loading file list...')}</div>
                 <div id="node_filter_box" style="display:none">
                 ${h.files_breadcrumbs(c.repo_name,c.changeset.raw_id,c.file.path)}/<input class="init form-control" type="text" value="type to search..." name="filter" size="25" id="node_filter">
                 </div>
             </div>
         </div>
     </div>
     <div class="panel-body">
         <table class="table code-browser">
             <thead>
                 <tr>
                     <th>${_('Name')}</th>
                     <th>${_('Size')}</th>
                     <th>${_('Last Revision')}</th>
                     <th>${_('Last Modified')}</th>
                     <th>${_('Last Committer')}</th>
                 </tr>
             </thead>
             <tbody id="tbody">
                 %if c.file.parent:
                 <tr class="parity0">
                     <td>
                         ${h.link_to(h.literal('<i class="icon-folder-open"></i><span>..</span>'),h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.file.parent.path),class_="browser-dir ypjax-link")}
                     </td>
                     <td></td>
                     <td></td>
                     <td></td>
                     <td></td>
                 </tr>
                 %endif
             %for cnt,node in enumerate(c.file):
                 <tr class="parity${cnt%2}">
                      <td>
                          ${h.link_to(file_name(node),file_url(node,c),class_=file_class(node)+" ypjax-link")}
                      </td>
                      <td>
                      %if node.is_file():
                          ${h.format_byte_size(node.size,binary=True)}
                      %endif
                      </td>
                      <td>
                          %if node.is_file():
                              <a data-toggle="tooltip" title="${node.last_changeset.message}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=node.last_changeset.raw_id)}" class="revision-link">${h.show_id(node.last_changeset)}</a>
                          %endif
                      </td>
                      <td>
                          %if node.is_file():
                              <span data-toggle="tooltip" title="${h.fmt_date(node.last_changeset.date)}">
                             ${h.age(node.last_changeset.date)}</span>
                          %endif
                      </td>
                      <td>
                          %if node.is_file():
                              <span title="${node.last_changeset.author}">
                             ${h.person(node.last_changeset.author)}
                             </span>
                          %endif
                      </td>
                 </tr>
             %endfor
             </tbody>
             <tbody id="tbody_filtered" style="display:none">
             </tbody>
         </table>
     </div>
 </div>
 <script>
     $(document).ready(function(){
         // init node filter if we pass GET param ?search=1
         var search_GET = ${h.js(request.GET.get('search',''))};
         if(search_GET == "1"){
             $("#filter_activate").click();
+        }
     });
 </script>

kallithea/templates/journal/journal_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 %if c.journal_day_aggregate:
     %for day,items in c.journal_day_aggregate:
         <h4>${day}</h4>
         % for user,entries in items:
-            <div class="journal_container">
+            <div class="container-fluid">
                 ${h.gravatar_div(user.email if user else 'anonymous@kallithea-scm.org', size=24)}
                 %if user:
-                    <div class="journal_user">${user.name} ${user.lastname}</div>
+                    <span class="journal_user">${user.name} ${user.lastname}</span>
                 %else:
-                    <div class="journal_user deleted">${entries[0].username}</div>
+                    <span class="journal_user deleted">${entries[0].username}</span>
                 %endif
                 <div class="journal_action_container">
                 % for entry in entries:
-                  <div class="container-fluid">
+                  <div class="clearfix">
                     <div class="pull-left">
                       <div class="journal_icon"> ${h.action_parser(entry)[2]()}</div>
                     </div>
                     <div class="pull-left">
                       <div class="journal_action">${h.action_parser(entry)[0]()}</div>
                       <div class="journal_repo">
                           <span class="journal_repo_name">
                           %if entry.repository is not None:
                             ${h.link_to(entry.repository.repo_name,
                                         h.url('summary_home',repo_name=entry.repository.repo_name))}
                           %else:
                             ${entry.repository_name}
                           %endif
                           </span>
                       </div>
                       <div class="journal_action_params">${h.literal(h.action_parser(entry)[1]())}</div>
                       <div class="date"><span data-toggle="tooltip" title="${h.fmt_date(entry.action_date)}">${h.age(entry.action_date)}</span></div>
                     </div>
                   </div>
                 %endfor
                 </div>
             </div>
         %endfor
     %endfor
     <ul class="pagination">
         ${c.journal_pager.pager()}
     </ul>
 %else:
   <div>
       ${_('No entries yet')}
   </div>
 %endif

0 comments (0 inline, 0 general)