kallithea Changeset - 88ce09daea37

@@ @@ -255,20 +255,20 @@ class CodeHtmlFormatter(HtmlFormatter): @@
         # in case you wonder about the seemingly redundant <div> here: since the
         # content in the other cell also is wrapped in a div, some browsers in
         # some configurations seem to mess up the formatting...
         if nocls:
             yield 0, ('<table class="%stable">' % self.cssclass +
                       '<tr><td><div class="linenodiv" '
                       'style="background-color: #f0f0f0; padding-right: 10px">'
                       '<pre style="line-height: 125%">' +
                       ls + '</pre></div></td><td id="hlcode" class="code">')
                       '<tr><td><div class="linenodiv">'
                       '<pre>' + ls + '</pre></div></td>'
                       '<td id="hlcode" class="code">')
         else:
             yield 0, ('<table class="%stable">' % self.cssclass +
                       '<tr><td class="linenos"><div class="linenodiv"><pre>' +
                       ls + '</pre></div></td><td id="hlcode" class="code">')
                       '<tr><td class="linenos"><div class="linenodiv">'
                       '<pre>' + ls + '</pre></div></td>'
                       '<td id="hlcode" class="code">')
         yield 0, dummyoutfile.getvalue()
         yield 0, '</td></tr></table>'
 _whitespace_re = re.compile(r'(\t)|( )(?=\n|</div>)')

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -1928,12 +1928,13 @@ BIN_FILENODE = 6 @@
 #graph_nodes {
     position: absolute;
     width: 100px;
+}
 #graph_content,
 #graph_content_pr,
 #graph .info_box,
 #graph .container_header {
     margin-left: 100px;
+}
 #graph_content {
@@ @@ -2006,12 +2007,13 @@ tr.out-of-range > td.mid > .message > a @@
+}
 #graph_content_pr .compare_view_commits .expand_commit,
 #graph_content .container .expand_commit {
     width: 24px;
     cursor: pointer;
     color: #999;
+}
 #graph_content #changesets .container .right {
     width: 120px;
     padding-right: 0px;
     overflow: visible;

kallithea/templates/admin/gists/edit.html

➞

Show inline comments

@@ @@ -139,13 +139,13 @@ @@
+                        }
                     });
                 </script>
             %endfor
-            <div style="padding-top: 5px">
             <div>
             ${h.submit('update',_('Update Gist'),class_="btn btn-success")}
             <a class="btn btn-default" href="${h.url('gist', gist_id=c.gist.gist_access_id)}">${_('Cancel')}</a>
             </div>
           ${h.end_form()}
           <script>
               $('#update').on('click', function(e){

kallithea/templates/admin/gists/index.html

➞

Show inline comments

@@ @@ -38,30 +38,30 @@ @@
         </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" style="padding:10px 20px 10px 15px">
           <div class="gist-item clearfix">
             ${h.gravatar_div(gist.owner.email, size=28)}
-            <div title="${gist.owner.full_contact}" class="user" style="font-size: 16px">
             <div 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>
-            <div style="padding: 4px 0px 0px 0px">
             <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" style="border:0px;padding:10px 0px 0px 40px">${gist.gist_description}</div>
             <div class="text-muted">${gist.gist_description}</div>
           </div>
         % endfor
         <ul class="pagination">
             ${c.gists_pager.pager(**request.GET.mixed())}
         </ul>

kallithea/templates/admin/my_account/my_account_api_keys.html

➞

Show inline comments

 <table class="table">
     <tr>
-        <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${c.user.api_key}</div></td>
         <td><div class="truncate autoexpand">${c.user.api_key}</div></td>
         <td>
             <span class="label label-success">${_('Built-in')}</span>
         </td>
         <td>${_('Expires')}: ${_('Never')}</td>
         <td>
             ${h.form(url('my_account_api_keys_delete'))}
@@ @@ -16,15 +16,15 @@ @@
             ${h.end_form()}
         </td>
     </tr>
     %if c.user_api_keys:
         %for api_key in c.user_api_keys:
           <tr class="${'expired' if api_key.is_expired else ''}">
-            <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${api_key.api_key}</div></td>
             <td><div class="truncate autoexpand">${api_key.api_key}</div></td>
             <td>${api_key.description}</td>
-            <td style="min-width: 80px">
             <td>
                  %if api_key.expires == -1:
                   ${_('Expires')}: ${_('Never')}
                  %else:
                     %if api_key.is_expired:
                         ${_('Expired')}: ${h.age(h.time_to_datetime(api_key.expires))}
                     %else:

kallithea/templates/admin/my_account/my_account_emails.html

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ @@
             <td>${h.gravatar_div(em.email, size=16)}</td>
             %endif
             <td><div class="email">${em.email}</div></td>
             <td>
                 ${h.form(url('my_account_emails_delete'))}
                     ${h.hidden('del_email_id',em.email_id)}
-                    <i class="icon-minus-circled" style="color:#FF4444"></i>
                     <i class="icon-minus-circled"></i>
                     ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id,
                     class_="btn btn-default btn-xs", onclick="return  confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}
                 ${h.end_form()}
             </td>
           </tr>
         %endfor

kallithea/templates/admin/permissions/permissions_ips.html

➞

Show inline comments

@@ @@ -5,13 +5,13 @@ @@
               <td><div class="ip">${ip.ip_addr}</div></td>
               <td><div class="ip">${h.ip_range(ip.ip_addr)}</div></td>
               <td>
                 ${h.form(url('edit_user_ips_delete', id=c.user.user_id))}
                     ${h.hidden('del_ip_id',ip.ip_id)}
                     ${h.hidden('default_user', 'True')}
-                    <i class="icon-minus-circled" style="color:#FF4444"></i> ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id,
                     <i class="icon-minus-circled"></i> ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id,
                     class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")}
                 ${h.end_form()}
               </td>
           </tr>
         %endfor
        %else:

kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html

➞

Show inline comments

@@ @@ -8,14 +8,14 @@ @@
     (_('Children groups'), c.repo_group.children.count(), ''),
     (_('Created on'), h.fmt_date(c.repo_group.created_on), ''),
     (_('Owner'), h.person(c.repo_group.owner), ''),
+ ]
 %>
 %for dt, dd, tt in elems:
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
   <dt>${dt}:</dt>
   <dd title="${tt}">${dd}</dd>
 %endfor
 </dl>
 ${h.form(h.url('delete_repos_group', group_name=c.repo_group.group_name))}
     <button class="btn btn-danger btn-sm" type="submit"
             onclick="return confirm('${ungettext('Confirm to delete this group: %s with %s repository',

kallithea/templates/admin/repo_groups/repo_group_edit_perms.html

➞

Show inline comments

@@ @@ -27,13 +27,13 @@ ${h.form(url('edit_repo_group_perms', gr @@
                             %else:
                              ${r2p.user.username if r2p.user.username != 'default' else _('Default')}
                             %endif
                         </td>
                         <td>
                           %if r2p.user.username !='default':
-                            <span style="color:#da4f49" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">
                             <span class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">
                              <i class="icon-minus-circled"></i> ${_('Revoke')}
                             </span>
                           %endif
                         </td>
                       %else:
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'group.none', disabled="disabled")}</td>
@@ @@ -64,23 +64,23 @@ ${h.form(url('edit_repo_group_perms', gr @@
                              </a>
                             %else:
                              ${g2p.users_group.users_group_name}
                             %endif
                         </td>
                         <td>
-                            <span style="color:#da4f49" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.users_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.users_group.users_group_name)}', '${g2p.users_group.users_group_name}')">
                             <span class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.users_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.users_group.users_group_name)}', '${g2p.users_group.users_group_name}')">
                             <i class="icon-minus-circled"></i> ${_('Revoke')}
                             </span>
                         </td>
                     </tr>
                 %endfor
                 ## New entries added by addPermAction here.
                 <tr class="new_members last_new_member" id="add_perm_input"><td colspan="6"></td></tr>
                 <tr>
                     <td colspan="6">
-                        <span id="add_perm" style="cursor: pointer;">
                         <span id="add_perm">
                             <i class="icon-plus"></i> ${_('Add new')}
                         </span>
                     </td>
                 </tr>
                 <tr>
                     <td colspan="6">

kallithea/templates/admin/repos/repo_creating.html

➞

Show inline comments

@@ @@ -24,16 +24,16 @@ @@
     <div class="panel-body">
             <h4 class="text-center">
                 ${_('Repository "%(repo_name)s" is being created, you will be redirected when this process is finished.' % {'repo_name':c.repo_name})}
             </h4>
-        <div id="progress" style="width: 500px;margin-left: auto; margin-right: auto">
         <div id="progress">
             <div class="progress progress-striped active">
                 <div class="progress-bar progress-bar" role="progressbar"
-                    aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
                     aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">
                 </div>
             </div>
         </div>
         <div id="progress_error" style="display: none;">
             <div class="alert alert-danger">
                 ${_("We're sorry but error occurred during this operation. Please check your Kallithea server logs, or contact administrator.")}

kallithea/templates/admin/repos/repo_edit_fields.html

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ @@
         <tr>
             <td>${field.field_label}</td>
             <td>${field.field_key}</td>
             <td>${field.field_type}</td>
             <td>
               ${h.form(url('delete_repo_fields', repo_name=c.repo_info.repo_name, field_id=field.repo_field_id))}
-                  <i class="icon-minus-circled" style="color:#FF4444"></i>
                   <i class="icon-minus-circled"></i>
                   ${h.submit('remove_%s' % field.repo_field_id, _('Delete'), id="remove_field_%s" % field.repo_field_id,
                   class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this field: %s') % field.field_key+"');")}
               ${h.end_form()}
             </td>
         </tr>
       %endfor

kallithea/templates/admin/repos/repo_edit_permissions.html

➞

Show inline comments

@@ @@ -36,13 +36,13 @@ ${h.form(url('edit_repo_perms_update', r @@
                             %else:
                              ${r2p.user.username if r2p.user.username != 'default' else _('Default')}
                             %endif
                         </td>
                         <td>
                           %if r2p.user.username !='default':
-                            <span style="color:#da4f49" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">
                             <span class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">
                             <i class="icon-minus-circled"></i> ${_('Revoke')}
                             </span>
                           %endif
                         </td>
                     </tr>
                     %endif
@@ @@ -61,23 +61,23 @@ ${h.form(url('edit_repo_perms_update', r @@
                              <a href="${h.url('edit_users_group',id=g2p.users_group.users_group_id)}">${g2p.users_group.users_group_name}</a>
                             %else:
                              ${g2p.users_group.users_group_name}
                             %endif
                         </td>
                         <td>
-                            <span style="color:#da4f49" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.users_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.users_group.users_group_name)}', '${g2p.users_group.users_group_name}')">
                             <span class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.users_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.users_group.users_group_name)}', '${g2p.users_group.users_group_name}')">
                             <i class="icon-minus-circled"></i> ${_('Revoke')}
                             </span>
                         </td>
                     </tr>
                 %endfor
                 ## New entries added by addPermAction here.
                 <tr class="new_members last_new_member" id="add_perm_input"><td colspan="6"></td></tr>
                 <tr>
                     <td colspan="6">
-                        <span id="add_perm" style="cursor: pointer;">
                         <span id="add_perm">
                             <i class="icon-plus"></i> ${_('Add new')}
                         </span>
                     </td>
                 </tr>
             </table>
         </div>

kallithea/templates/admin/settings/settings_hooks.html

➞

Show inline comments

@@ @@ -2,13 +2,13 @@ @@
     <div class="form-horizontal">
       <div class="form-group">
       <h4>${_('Built-in Mercurial Hooks (Read-Only)')}</h4>
       % for hook in c.hooks:
         <% input_id = hook.ui_key.replace('.', '_') %>
             <label class="control-label" for="${input_id}">${hook.ui_key}</label>
-            <div style="margin-left:280px">
             <div>
               ${h.text(hook.ui_key,hook.ui_value,id=input_id,size=60,readonly="readonly",class_='form-control')}
             </div>
       % endfor
       <span class="help-block">${_('Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications.')}</span>
       </div>
     </div>
@@ @@ -20,35 +20,35 @@ ${h.form(url('admin_settings_hooks'), me @@
     <div class="form-horizontal">
         <div class="form-group form-inline" id="${'id%s' % hook.ui_id }">
         <h4>${_('Custom Hooks')}</h4>
         %for hook in c.custom_hooks:
             <% input_id = hook.ui_key.replace('.', '_') %>
                 <label class="control-label" for="${input_id}">${hook.ui_key}</label>
-                <div style="margin-left:280px">
                 <div>
                     ${h.hidden('hook_ui_key',hook.ui_key,id='hook_ui_key_'+input_id)}
                     ${h.hidden('hook_ui_value',hook.ui_value,id='hook_ui_value_'+input_id)}
                     ${h.text('hook_ui_value_new',hook.ui_value,id=input_id,size=60,class_='form-control')}
                     <span class="btn btn-default btn-xs"
                         onclick="delete_hook(${hook.ui_id},'${'id%s' % hook.ui_id }')">
-                        <i class="icon-minus-circled" style="color:#FF4444"></i>
                         <i class="icon-minus-circled"></i>
                         ${_('Delete')}
                     </span>
                 </div>
         %endfor
         </div>
         <div class="form-group form-inline">
             <label>
                 ${h.text('new_hook_ui_key',size=15,class_='form-control')}
             </label>
-            <div style="margin-left:280px">
             <div>
                 ${h.text('new_hook_ui_value',size=60,class_='form-control')}
             </div>
         </div>
         <div class="form-group">
-            <div class="buttons" style="margin-left:280px">
             <div class="buttons">
                 ${h.submit('save',_('Save'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 </div>
 ${h.end_form()}

kallithea/templates/admin/settings/settings_system.html

➞

Show inline comments

 <div id="update_notice" style="display: none">
-    <div style="padding: 5px 0px 5px 0px; color: #000000; font-weight: bold">${_('Checking for updates...')}</div>
     <div>${_('Checking for updates...')}</div>
 </div>
 <%
  elems = [
-    (_('Kallithea version'), h.literal('%s <b><span style="display:none; color:#036185; text-decoration: underline;cursor: pointer" id="check_for_update" >%s</span></b>' % (c.kallithea_version, _('Check for updates'))), ''),
+    (_('Kallithea version'), h.literal('%s <b><span id="check_for_update" style="display:none">%s</span></b>' % (c.kallithea_version, _('Check for updates'))), ''),
     (_('Kallithea configuration file'), c.ini['__file__'], ''),
     (_('Python version'), c.py_version, ''),
     (_('Platform'), c.platform, ''),
     (_('Git version'), c.git_version, ''),
     (_('Git path'), c.ini.get('git_path'), ''),
     (_('Upgrade info endpoint'), h.literal('%s <br/><span class="text-muted">%s.</span>' % (c.update_url, _('Note: please make sure this server can access this URL'))), ''),
+ ]
 %>
 <dl class="dl-horizontal">
 %for dt, dd, tt in elems:
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
   <dt>${dt}:</dt>
   <dd title="${tt}">${dd}</dd>
 %endfor
 </dl>
 <h4>${_('Python Packages')}</h4>
-<table class="table" style="margin:0px 0px 0px 0px">
 <table class="table">
   <colgroup>
-      <col style="width:180px">
       <col>
       <col>
   </colgroup>
   <tbody>
       %for key, value in c.modules:
           <tr>
-              <td style="padding-right:5px;">${key}</td>
               <td>${key}</td>
               <td>${value}</td>
           </tr>
       %endfor
   </tbody>
 </table>

kallithea/templates/admin/settings/settings_system_update.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ## upgrade block rendered afte on-click check
 <div class="alert ${'alert-warning' if c.should_upgrade else 'alert-success'}">
 <p style="padding: 2px 0px 5px 0px; margin: 0px">
 <p>
 %if c.should_upgrade:
     A <b>new version</b> is available:
     %if c.latest_data.get('title'):
         <b>${h.literal(c.latest_data['title'])}</b>
     %else:
         <b>${c.latest_ver}</b>

kallithea/templates/admin/user_groups/user_group_edit_advanced.html

➞

Show inline comments

@@ @@ -6,14 +6,14 @@ @@
     (_('Members'), len(c.group_members_obj), ''),
     (_('Created on'), h.fmt_date(c.user_group.created_on), ''),
     (_('Owner'), h.person(c.user_group.owner), ''),
+    ]
 %>
 %for dt, dd, tt in elems:
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
   <dt>${dt}:</dt>
   <dd title="${tt}">${dd}</dd>
 %endfor
 </dl>
 ${h.form(h.url('delete_users_group', id=c.user_group.users_group_id))}
     <button class="btn btn-danger btn-sm" type="submit"
             onclick="return confirm('${_('Confirm to delete this user group: %s') % c.user_group.users_group_name}');">

kallithea/templates/admin/user_groups/user_group_edit_perms.html

➞

Show inline comments

@@ @@ -27,13 +27,13 @@ ${h.form(url('edit_user_group_perms_upda @@
                             %else:
                              ${r2p.user.username if r2p.user.username != 'default' else _('Default')}
                             %endif
                         </td>
                         <td>
                           %if r2p.user.username !='default':
-                            <span style="color:#da4f49" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">
                             <span class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${r2p.user.user_id}, 'user', '${'id%s'%id(r2p.user.username)}', '${r2p.user.username}')">
                              <i class="icon-minus-circled"></i> ${_('Revoke')}
                             </span>
                           %endif
                         </td>
                       %else:
                         <td>${h.radio('u_perm_%s' % r2p.user.username,'usergroup.none', disabled="disabled")}</td>
@@ @@ -64,13 +64,13 @@ ${h.form(url('edit_user_group_perms_upda @@
                              </a>
                             %else:
                              ${g2p.user_group.users_group_name}
                             %endif
                         </td>
                         <td>
-                            <span style="color:#da4f49" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.user_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.user_group.users_group_name)}', '${g2p.user_group.users_group_name}')">
                             <span class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.user_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.user_group.users_group_name)}', '${g2p.user_group.users_group_name}')">
                             <i class="icon-minus-circled"></i> ${_('Revoke')}
                             </span>
                         </td>
                     </tr>
                 %endfor
                 ## New entries added by addPermAction here.

kallithea/templates/admin/user_groups/user_group_edit_settings.html

➞

Show inline comments

@@ @@ -20,27 +20,26 @@ ${h.form(url('update_users_group', id=c. @@
                         ${h.checkbox('users_group_active',value=True)}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label">${_('Members')}:</label>
                     <div>
                         <div style="float:left">
                             <div class="text" style="padding: 0px 0px 6px;">${_('Chosen group members')}</div>
                         <div>
                             <div class="text">${_('Chosen group members')}</div>
                             ${h.select('users_group_members',[],c.group_members,multiple=True,size=8,style="min-width:210px",class_='form-control')}
                         </div>
                         <div style="float:left;width:20px;padding-top:50px">
                             <i style="cursor:pointer; font-size: 16px" id="add_element" class="icon-left-open" title="Choose selected available"></i>
                             <div style="height:50px"></div>
                             <i style="cursor:pointer; font-size: 16px" id="remove_element" class="icon-right-open" title="Remove selected chosen"></i>
                         <div>
                             <i id="add_element" class="icon-left-open" title="Choose selected available"></i>
                             <div></div>
                             <i id="remove_element" class="icon-right-open" title="Remove selected chosen"></i>
                         </div>
                         <div style="float:left">
                             <div class="text" style="padding: 0px 0px 6px;">${_('Available members')}</div>
                         <div>
                             <div class="text">${_('Available members')}</div>
                             ${h.select('available_members',[],c.available_members,multiple=True,size=8,style="min-width:210px",class_='form-control')}
                         </div>
                     </div>
                     <div style="clear:both"></div>
                 </div>
                 <div class="form-group">
                     <div class="buttons">
                         ${h.submit('Save',_('Save'),class_="btn btn-default")}
                     </div>
                 </div>

kallithea/templates/admin/users/user_edit_advanced.html

➞

Show inline comments

@@ @@ -8,14 +8,14 @@ @@
     (_('Created on'), h.fmt_date(c.user.created_on), ''),
     (_('Last Login'), c.user.last_login or '-', ''),
     (_('Member of User Groups'), len(c.user.group_member), ', '.join((x.users_group.users_group_name for x in c.user.group_member))),
+ ]
 %>
 %for dt, dd, tt in elems:
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
   <dt>${dt}:</dt>
   <dd title="${tt}">${dd}</dd>
 %endfor
 </dl>
 ${h.form(h.url('delete_user', id=c.user.user_id))}
     <button class="btn btn-danger btn-sm" type="submit"
             onclick="return confirm('${_('Confirm to delete this user: %s') % c.user.username}');">

kallithea/templates/admin/users/user_edit_api_keys.html

➞

Show inline comments

 <table class="table">
     <tr>
-        <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${c.user.api_key}</div></td>
         <td><div class="truncate autoexpand">${c.user.api_key}</div></td>
         <td>
             <span class="label label-success">${_('Built-in')}</span>
         </td>
         <td>${_('Expires')}: ${_('Never')}</td>
         <td>
             ${h.form(url('edit_user_api_keys_delete', id=c.user.user_id))}
@@ @@ -16,15 +16,15 @@ @@
             ${h.end_form()}
         </td>
     </tr>
     %if c.user_api_keys:
         %for api_key in c.user_api_keys:
           <tr class="${'expired' if api_key.is_expired else ''}">
-            <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${api_key.api_key}</div></td>
             <td><div class="truncate autoexpand">${api_key.api_key}</div></td>
             <td>${api_key.description}</td>
-            <td style="min-width: 80px">
             <td>
                  %if api_key.expires == -1:
                   ${_('Expires')}: ${_('Never')}
                  %else:
                     %if api_key.is_expired:
                         ${_('Expired')}: ${h.age(h.time_to_datetime(api_key.expires))}
                     %else:

kallithea/templates/admin/users/user_edit_emails.html

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ @@
             <td>${h.gravatar_div(c.user.email, size=16)}</td>
             %endif
             <td><div class="email">${em.email}</div></td>
             <td>
                 ${h.form(url('edit_user_emails_delete', id=c.user.user_id))}
                     ${h.hidden('del_email_id',em.email_id)}
-                    <i class="icon-minus-circled" style="color:#FF4444"></i>
                     <i class="icon-minus-circled"></i>
                     ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id,
                     class_="btn btn-default btn-xs", onclick="return  confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}
                 ${h.end_form()}
             </td>
           </tr>
         %endfor

kallithea/templates/admin/users/user_edit_ips.html

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ @@
           <tr>
             <td><div class="ip">${ip.ip_addr}</div></td>
             <td><div class="ip">${h.ip_range(ip.ip_addr)}</div></td>
             <td>
                 ${h.form(url('edit_user_ips_delete', id=c.user.user_id))}
                     ${h.hidden('del_ip_id',ip.ip_id)}
-                    <i class="icon-minus-circled" style="color:#FF4444"></i>
                     <i class="icon-minus-circled"></i>
                     ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id,
                     class_="btn btn-default btn-xs", onclick="return  confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")}
                 ${h.end_form()}
             </td>
           </tr>
         %endfor

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -96,20 +96,20 @@ ${self.repo_context_bar('changelog', c.f @@
                           %endif
                         </td>
                         <td class="author">
                             ${h.gravatar(h.email_or_none(cs.author), size=16)}
                             <span data-toggle="tooltip" title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
                         </td>
-                        <td class="hash" style="width:${len(h.show_id(cs))*6.5}px">
                         <td class="hash">
                             ${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id), class_='changeset_hash')}
                         </td>
                         <td class="date">
                             <div class="date" data-toggle="tooltip" title="${h.fmt_date(cs.date)}">${h.age(cs.date,True)}</div>
                         </td>
                         <td class="expand_commit" data-commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
-                            <i class="icon-align-left" style="color:#999"></i>
                             <i class="icon-align-left"></i>
                         </td>
                         <td class="mid">
                                 <div class="message" id="C-${cs.raw_id}">${h.urlify_text(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
                                 <div class="extra-container">
                                     %if c.comments.get(cs.raw_id):
                                         <div class="comments-container">

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -79,13 +79,13 @@ @@
     ${c.repo_changesets.pager()}
 </ul>
 %else:
 %if h.HasRepoPermissionLevel('write')(c.repo_name):
 <h4>${_('Add or upload files directly via Kallithea')}</h4>
-<div style="margin: 20px 30px;">
 <div>
   <div id="add_node_id" class="add_node">
       <a class="btn btn-default btn-xs" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='', anchor='edit')}">${_('Add New File')}</a>
   </div>
 </div>
 %endif

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -238,18 +238,18 @@ ${self.repo_context_bar('changelog', c.c @@
                           window.location = pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': commit.raw_id});
+                      }
                       else if(data.results.length === 2){
                           $('#child_link').addClass('disabled');
                           $('#child_link').addClass('double');
                           var _html = '';
-                          _html +='<a title="__title__" href="__url__">__rev__</a> <i style="color:#036185" class="icon-right-open"></i>'
                           _html +='<a title="__title__" href="__url__">__rev__</a> <i class="icon-right-open"></i>'
                                   .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[0].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[0].raw_id}));
                           _html +='<br/>'
-                          _html +='<a title="__title__" href="__url__">__rev__</a> <i style="color:#036185" class="icon-right-open"></i>'
                           _html +='<a title="__title__" href="__url__">__rev__</a> <i class="icon-right-open"></i>'
                                   .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[1].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[1].raw_id}));
                           $('#child_link').html(_html);
+                      }
+                    }
@@ @@ -275,18 +275,18 @@ ${self.repo_context_bar('changelog', c.c @@
                           window.location = pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': commit.raw_id});
+                      }
                       else if(data.results.length === 2){
                           $('#parent_link').addClass('disabled');
                           $('#parent_link').addClass('double');
                           var _html = '';
-                          _html +='<i style="color:#036185" class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
                           _html +='<i class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
                                   .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[0].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[0].raw_id}));
                           _html +='<br/>'
-                          _html +='<i style="color:#036185" class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
                           _html +='<i class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'
                                   .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))
                                   .replace('__title__', data.results[1].message)
                                   .replace('__url__', pyroutes.url('changeset_home', {'repo_name': ${h.js(c.repo_name)},'revision': data.results[1].raw_id}));
                           $('#parent_link').html(_html);
+                      }
+                    }

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -23,13 +23,13 @@ @@
               %endif
               <a class="permalink" href="${co.url()}">&para;</a>
           </span>
           %if co.author_id == request.authuser.user_id or h.HasRepoPermissionLevel('admin')(c.repo_name):
             %if co.deletable():
-              <div onClick="confirm('${_('Delete comment?')}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-default btn-xs" style="margin:0 5px">${_('Delete')}</div>
               <div onClick="confirm('${_('Delete comment?')}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-default btn-xs">${_('Delete')}</div>
             %endif
           %endif
       </div>
       <div class="text">
         %if co.status_change:
            <div class="automatic-comment">

kallithea/templates/changeset/diff_block.html

➞

Show inline comments

@@ @@ -22,13 +22,13 @@ @@
     <div id="${id_fid}" class="panel panel-default ${cls}">
         <div class="panel-heading clearfix">
                 <div class="pull-left">
                     ${h.safe_unicode(cs_filename)}
                 </div>
                 <div class="pull-left diff-actions">
-                  <span style="margin: 0 10px">
                   <span>
                     %if op == 'A':
                       <span class="no-file" data-toggle="tooltip" title="${_('No file before')}">
                         <i class="icon-minus-circled"></i></span>
                     %else:
                       <a href="${h.url('files_home', repo_name=a_repo_name, f_path=a_filename, revision=a_rev)}" data-toggle="tooltip" title="${_('File before')}">
                         <i class="icon-doc"></i></a>

kallithea/templates/compare/compare_cs.html

➞

Show inline comments

@@ @@ -4,16 +4,16 @@ @@
     <span class="empty_data">${_('No changesets')}</span>
   %else:
     %if c.ancestors:
       <div class="ancestor">
         %if len(c.ancestors) > 1:
-        <div style="color:red; font-weight: bold">
+        <div class="text-danger">
           ${_('Criss cross merge situation with multiple merge ancestors detected!')}
         </div>
-        <div style="color:red">
         <div>
           ${_('Please merge the target branch to your branch before creating a pull request.')}
         </div>
         %endif
         <div>
           ${_('Merge Ancestor')}:
           %for ancestor in c.ancestors:
@@ @@ -21,21 +21,21 @@ @@
           %endfor
         </div>
       </div>
     %endif
     <div id="graph_nodes">
-        <canvas id="graph_canvas" style="width:0"></canvas>
         <canvas id="graph_canvas"></canvas>
     </div>
-    <div id="graph_content_pr" style="margin-left: 100px;">
     <div id="graph_content_pr">
     <table class="table compare_view_commits">
     %for cnt, cs in enumerate(reversed(c.cs_ranges)):
       <tr id="chg_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 else ''}">
-        <td style="width:50px">
         <td>
           %if cs.raw_id in c.statuses:
             <div title="${_('Changeset status: %s') % c.statuses[cs.raw_id][1]}" class="changeset-status-ico">
                 <i class="icon-circle changeset-status-${c.statuses[cs.raw_id][0]}"></i>
             </div>
           %endif
           %if c.cs_comments.get(cs.raw_id):
@@ @@ -61,28 +61,28 @@ @@
                   title = _('Position in this list of changesets')
           %>
           <span data-toggle="tooltip" title="${title}">
             ${index}
           </span>
         </td>
-        <td style="width: 140px"><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
         <td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
         <td class="author">
             ${h.gravatar(h.email_or_none(cs.author), size=16)}
             <span data-toggle="tooltip" title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
         </td>
         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>
         <td>
         %if cs.branch:
         <span class="branchtag">${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.cs_repo.repo_name,branch=cs.branch))}</span>
         %endif
         </td>
         <td class="expand_commit" data-commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
-            <i class="icon-align-left" style="color:#999"></i>
             <i class="icon-align-left"></i>
         </td>
         <td class="mid">
-            <div class="pull-right" style="margin-top: -4px;">
             <div class="pull-right">
                 %for tag in cs.tags:
                     <span class="tagtag" title="${_('Tag %s') % tag}">
                         ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
                     </span>
                 %endfor
             </div>
@@ @@ -106,13 +106,13 @@ @@
           merge='1')
         )}
       </h5>
     %endif
     %if c.cs_ranges_org is not None:
       ## TODO: list actual changesets?
-      <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">
       <div>
         ${h.link_to_ref(c.cs_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)}
         ${_('is')}
         <a href="${c.swap_url}">${_('%s changesets') % (len(c.cs_ranges_org))}</a>
         ${_('behind')}
         ${h.link_to_ref(c.a_repo.repo_name, c.a_ref_type, c.a_ref_name)}
       </div>

kallithea/templates/data_table/_dt_elements.html

➞

Show inline comments

@@ @@ -21,14 +21,12 @@ @@
     ##PRIVATE/PUBLIC
     %if private and c.visual.show_private_icon:
       <i class="icon-keyhole-circled" title="${_('Private repository')}"></i>
     %elif not private and c.visual.show_public_icon:
       <i class="icon-globe" title="${_('Public repository')}"></i>
     %else:
       <span style="margin: 0px 8px 0px 8px"></span>
     %endif
     <span class="dt_repo_name">${get_name(name)}</span>
     </a>
     %if fork_of:
       <a href="${h.url('summary_home',repo_name=fork_of.repo_name)}"><i class="icon-fork"></i></a>
     %endif
@@ @@ -74,13 +72,13 @@ @@
       <a href="${h.url('edit_repo',repo_name=repo_name)}" title="${_('Edit')}">
         <i class="icon-pencil"></i> ${h.submit('edit_%s' % repo_name,_('Edit'),class_="btn btn-default btn-xs")}
       </a>
     </div>
     <div class="grid_delete pull-left">
       ${h.form(h.url('delete_repo', repo_name=repo_name))}
-        <i class="icon-minus-circled" style="color:#FF4444"></i>
         <i class="icon-minus-circled"></i>
         ${h.submit('remove_%s' % repo_name,_('Delete'),class_="btn btn-default btn-xs",
         onclick="return confirm('"+_('Confirm to delete this repository: %s') % repo_name+"');")}
       ${h.end_form()}
     </div>
   </div>
 </%def>
@@ @@ -102,13 +100,13 @@ @@
    <a href="${h.url('edit_user',id=user_id)}" title="${_('Edit')}">
      <i class="icon-pencil"></i> ${h.submit('edit_%s' % username,_('Edit'),class_="btn btn-default btn-xs")}
    </a>
  </div>
  <div class="grid_delete pull-left">
   ${h.form(h.url('delete_user', id=user_id))}
-    <i class="icon-minus-circled" style="color:#FF4444"></i>
     <i class="icon-minus-circled"></i>
     ${h.submit('remove_',_('Delete'),id="remove_user_%s" % user_id, class_="btn btn-default btn-xs",
     onclick="return confirm('"+_('Confirm to delete this user: %s') % username+"');")}
   ${h.end_form()}
  </div>
 </%def>
@@ @@ -117,13 +115,13 @@ @@
     <a href="${h.url('edit_users_group', id=user_group_id)}" title="${_('Edit')}">
     <i class="icon-pencil"></i> ${h.submit('edit_%s' % user_group_name,_('Edit'),class_="btn btn-default btn-xs", id_="submit_user_group_edit")}
     </a>
  </div>
  <div class="grid_delete pull-left">
     ${h.form(h.url('delete_users_group', id=user_group_id))}
-      <i class="icon-minus-circled" style="color:#FF4444"></i>
       <i class="icon-minus-circled"></i>
       ${h.submit('remove_',_('Delete'),id="remove_group_%s" % user_group_id, class_="btn btn-default btn-xs",
       onclick="return confirm('"+_('Confirm to delete this user group: %s') % user_group_name+"');")}
     ${h.end_form()}
  </div>
 </%def>
@@ @@ -132,13 +130,13 @@ @@
     <a href="${h.url('edit_repo_group',group_name=repo_group_name)}" title="${_('Edit')}">
     <i class="icon-pencil"></i> ${h.submit('edit_%s' % repo_group_name, _('Edit'),class_="btn btn-default btn-xs")}
     </a>
  </div>
  <div class="grid_delete pull-left">
     ${h.form(h.url('delete_repos_group', group_name=repo_group_name))}
-        <i class="icon-minus-circled" style="color:#FF4444"></i>
         <i class="icon-minus-circled"></i>
         ${h.submit('remove_%s' % repo_group_name,_('Delete'),class_="btn btn-default btn-xs",
         onclick="return confirm('"+ungettext('Confirm to delete this group: %s with %s repository','Confirm to delete this group: %s with %s repositories',gr_count) % (repo_group_name, gr_count)+"');")}
     ${h.end_form()}
  </div>
 </%def>

kallithea/templates/files/files_history_box.html

➞

Show inline comments

-<div class="file_author" style="clear:both">
 <div class="file_author">
     <div class="item">${h.literal(ungettext(u'%s author',u'%s authors',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }</div>
     %for email, user in c.authors:
       <div class="contributor pull-left" data-toggle="tooltip" title="${user}">
         ${h.gravatar_div(email, size=20, div_style="margin:1px")}
       </div>
     %endfor

kallithea/templates/files/files_source.html

➞

Show inline comments

-<div id="node_history" class="clearfix" style="padding: 0px 0px 10px 0px">
 <div id="node_history" class="clearfix">
     <div class="pull-left">
         ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
         ${h.hidden('diff2',c.changeset.raw_id)}
         ${h.hidden('diff1')}
         ${h.submit('diff',_('Diff to Revision'),class_="btn btn-default btn-sm")}
         ${h.submit('show_rev',_('Show at Revision'),class_="btn btn-default btn-sm")}
         ${h.hidden('annotate', c.annotate)}
         ${h.link_to(_('Show Full History'),h.url('changelog_file_home',repo_name=c.repo_name, revision=c.changeset.raw_id, f_path=c.f_path),class_="btn btn-default btn-sm")}
         ${h.link_to(_('Show Authors'),'#',class_="btn btn-default btn-sm" ,id="show_authors")}
         ${h.end_form()}
     </div>
-    <div id="file_authors" class="file_author" style="clear:both; display: none"></div>
     <div id="file_authors" class="file_author" style="display: none"></div>
 </div>
 <div id="body" class="panel panel-default">
     <div class="panel-heading clearfix">
         <div class="pull-left">
             <div class="pull-left img"><i class="icon-doc-inv"></i></div>

kallithea/templates/files/files_ypjax.html

➞

Show inline comments

@@ @@ -5,13 +5,13 @@ @@
         - ${_('annotation')}
         %endif
         %if c.file.is_dir():
           % if h.HasRepoPermissionLevel('write')(c.repo_name):
              / <span title="${_('Add New File')}">
                <a href="${h.url('files_add_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit')}">
-                   <i class="icon-plus-circled" style="color:#5bb75b; font-size: 16px"></i></a>
                    <i class="icon-plus-circled"></i></a>
                </span>
           % endif
         %endif
     </h3>
         %if c.file.is_dir():
             <%include file='files_browser.html'/>

kallithea/templates/followers/followers_data.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 % for f in c.followers_pager:
     <div>
         <div class="follower_user">
             ${h.gravatar_div(f.user.email, size=24)}
-            <span style="font-size: 20px"> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span>
             <span> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span>
         </div>
-        <div style="clear:both;padding-top: 10px"></div>
         <div></div>
         <div class="follower_date">${_('Started following -')}
         <span data-toggle="tooltip" title="${f.follows_from}"> ${h.age(f.follows_from)}</span></div>
-        <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
         <div></div>
     </div>
 % endfor
 <ul class="pagination">
     ${c.followers_pager.pager()}
 </ul>

kallithea/templates/forks/forks_data.html

➞

Show inline comments

@@ @@ -2,26 +2,25 @@ @@
 % if c.forks_pager:
     % for f in c.forks_pager:
         <div>
             <div class="fork_user">
                 ${h.gravatar_div(f.owner.email, size=24)}
-                <span style="font-size: 20px">
                 <span>
                  <b>${f.owner.username}</b> (${f.owner.name} ${f.owner.lastname}) /
                   ${h.link_to(f.repo_name,h.url('summary_home',repo_name=f.repo_name))}
                 </span>
-                <div style="padding:5px 3px 3px 42px;">${f.description}</div>
                 <div>${f.description}</div>
             </div>
-            <div style="clear:both;padding-top: 10px"></div>
             <div></div>
             <div class="follower_date">${_('Forked')} -
                 <span data-toggle="tooltip" title="${h.fmt_date(f.created_on)}"> ${h.age(f.created_on)}</span>
                 <a title="${_('Compare fork with %s') % c.repo_name}"
                    href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}"
                    class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a>
             </div>
             <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
         </div>
     % endfor
     <ul class="pagination">
         ${c.forks_pager.pager()}
     </ul>
 % else:

kallithea/templates/journal/journal_data.html

➞

Show inline comments

@@ @@ -40,10 +40,10 @@ @@
     %endfor
     <ul class="pagination">
         ${c.journal_pager.pager()}
     </ul>
 %else:
-  <div style="padding:5px 0px 10px 10px;">
   <div>
       ${_('No entries yet')}
   </div>
 %endif

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -41,35 +41,35 @@ ${self.repo_context_bar('showpullrequest @@
             <div class="form-group">
                 <label class="control-label">${_('Changeset flow')}:</label>
                 <div class="clearfix">
                     ##ORG
                     <div>
                         <div>
-                            <div style="padding:5px 3px 3px 3px;">
                             <div>
                             <b>${_('Origin repository')}:</b> <span id="org_repo_desc">${c.db_repo.description.split('\n')[0]}</span>
                             </div>
                             <div>
                             ${h.select('org_repo','',c.cs_repos,class_='refs')}:${h.select('org_ref',c.default_cs_ref,c.cs_refs,class_='refs')}
                             </div>
-                            <div style="padding:5px 3px 3px 3px;">
                             <div>
                             <b>${_('Revision')}:</b> <span id="org_rev_span">-</span>
                             </div>
                         </div>
                     </div>
                     ##OTHER, most Probably the PARENT OF THIS FORK
-                    <div style="border-top: 1px solid #EEE; margin: 5px 0px 0px 0px">
                     <div>
                         <div>
                             ## filled with JS
-                            <div style="padding:5px 3px 3px 3px;">
                             <div>
                             <b>${_('Destination repository')}:</b> <span id="other_repo_desc">${c.a_repo.description.split('\n')[0]}</span>
                             </div>
                             <div>
                             ${h.select('other_repo',c.a_repo.repo_name,c.a_repos,class_='refs')}:${h.select('other_ref',c.default_a_ref,c.a_refs,class_='refs')}
                             </div>
-                            <div style="padding:5px 3px 3px 3px;">
                             <div>
                             <b>${_('Revision')}:</b> <span id="other_rev_span">-</span>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>

kallithea/templates/pullrequests/pullrequest_data.html

➞

Show inline comments

@@ @@ -55,15 +55,15 @@ @@
       <td>
         <% other_ref_name=pr.other_ref.rsplit(':', 2)[-2] %>
         <a href="${h.url('summary_home', repo_name=pr.other_repo.repo_name, anchor=other_ref_name)}">
           ${pr.other_repo.repo_name}#${other_ref_name}
         </a>
       </td>
-      <td style="text-align:right">
       <td>
         %if pr.owner_id == request.authuser.user_id:
-          ${h.form(url('pullrequest_delete', repo_name=pr.other_repo.repo_name, pull_request_id=pr.pull_request_id), style="display:inline-block")}
           ${h.form(url('pullrequest_delete', repo_name=pr.other_repo.repo_name, pull_request_id=pr.pull_request_id))}
           <button class="btn btn-default btn-xs"
                   id="remove_${pr.pull_request_id}"
                   name="remove_${pr.pull_request_id}"
                   title="${_('Delete Pull Request')}"
                   onclick="return confirm('${_('Confirm to delete this pull request')}')
                       && ((${len(pr.comments)} == 0) ||

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -31,13 +31,13 @@ ${self.repo_context_bar('showpullrequest @@
               (${_('Closed')})
           %endif
         </h3>
       </div>
       <div id="pr-summary" class="form-horizontal">
-        <div class="pr-not-edit form-group" style="min-height:47px">
         <div class="pr-not-edit form-group">
             <label>${_('Description')}:</label>
             %if editable:
             <div id="pr-edit-btn">
               <a class="btn btn-default btn-xs" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>
             </div>
             %endif
@@ @@ -64,13 +64,13 @@ ${self.repo_context_bar('showpullrequest @@
         <div class="form-group">
           <label>${_('Reviewer voting result')}:</label>
           <div>
             <div class="changeset-status-container">
             %if c.current_voting_result:
-              <span class="changeset-status-ico" style="padding:0px 4px 0px 0px">
               <span class="changeset-status-ico">
                   <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i></span>
               <span class="changeset-status-lbl" data-toggle="tooltip" title="${_('Pull request status calculated from votes')}">
                 %if c.pull_request.is_closed():
                     ${_('Closed')},
                 %endif
                 ${h.changeset_status_lbl(c.current_voting_result)}
@@ @@ -117,15 +117,15 @@ ${self.repo_context_bar('showpullrequest @@
           <label>${_('Pull changes')}:</label>
           <div>
             %if c.cs_ranges:
               <div>
                ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases?
                %if h.is_hg(c.pull_request.org_repo):
-                 <span style="font-family: monospace">hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span>
                  <span>hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span>
                %elif h.is_git(c.pull_request.org_repo):
-                 <span style="font-family: monospace">git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span>
                  <span>git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span>
                %endif
               </div>
             %endif
           </div>
         </div>
         <div class="form-group">
@@ @@ -149,17 +149,17 @@ ${self.repo_context_bar('showpullrequest @@
         <div class="form-group">
           <label>${_('Next iteration')}:</label>
             <div>
               <div class="msg-div">${c.update_msg}</div>
               %if c.avail_revs:
               <div id="updaterevs" class="clearfix" style="max-height:200px; overflow-y:auto; overflow-x:hidden; margin-bottom: 10px; padding: 1px 0">
                 <div style="height:0;width:40px">
                   <canvas id="avail_graph_canvas" style="width:0"></canvas>
               <div id="updaterevs" class="clearfix">
                 <div>
                   <canvas id="avail_graph_canvas"></canvas>
                 </div>
-                <table class="table" id="updaterevs-table" style="padding-left:50px">
                 <table class="table" id="updaterevs-table">
                   %for cnt, cs in enumerate(c.avail_cs):
                     <tr id="chg_available_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 and not (editable and cs.revision in c.avail_revs) else ''}">
                       %if c.cs_ranges and cs.revision == c.cs_ranges[-1].revision:
                         %if editable:
                         <td>
                             ${h.radio(name='updaterev', value='', checked=True)}
@@ @@ -169,23 +169,23 @@ ${self.repo_context_bar('showpullrequest @@
                       %else:
                         %if editable:
                         <td>
                           ${h.radio(name='updaterev', value=cs.raw_id, style=None if cs.revision in c.avail_revs else 'visibility: hidden')}
                         </td>
                         %endif
-                        <td style="width: 120px"><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                         <td><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>
                         <td>
-                          <div class="pull-right" style="margin-top: -4px;">
                           <div class="pull-right">
                             %for tag in cs.tags:
                               <span class="tagtag" title="${_('Tag %s') % tag}">
                                 ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
                               </span>
                             %endfor
                           </div>
-                          <div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_text(cs.message, c.repo_name)}</div>
                           <div class="message">${h.urlify_text(cs.message, c.repo_name)}</div>
                         </td>
                       %endif
                     </tr>
                   %endfor
                 </table>
               </div>
@@ @@ -205,13 +205,13 @@ ${self.repo_context_bar('showpullrequest @@
         %endif
       </div>
     </div>
     ## REVIEWERS
     <div class="pull-left">
         <h4 class="pr-details-title">${_('Pull Request Reviewers')}</h4>
-        <div id="reviewers" style="padding:0px 0px 5px 10px">
         <div id="reviewers">
           ## members goes here !
           <div>
             %for member,status in c.pull_request_reviewers:
               <input type="hidden" value="${member.user_id}" name="org_review_members" />
             %endfor
             <ul id="review_members" class="list-unstyled">
@@ @@ -251,13 +251,13 @@ ${self.repo_context_bar('showpullrequest @@
           </div>
           %endif
         </div>
         %if not c.pull_request_reviewers:
         <h4>${_('Potential Reviewers')}</h4>
-        <div style="margin: 10px 0 10px 10px; max-width: 250px">
         <div>
           <div>
             ${_('Click to add the repository owner as reviewer:')}
           </div>
           <ul class="list-unstyled">
             %for u in [c.pull_request.other_repo.owner]:
               <li>
@@ @@ -273,14 +273,12 @@ ${self.repo_context_bar('showpullrequest @@
               </li>
             %endfor
           </ul>
         </div>
         %endif
     </div>
     <div style="clear:both">
     </div>
   ${h.end_form()}
 </div>
 <div class="panel panel-primary">
     <div class="panel-heading clearfix">
       <div class="breadcrumbs">${_('Pull Request Content')}</div>

kallithea/templates/search/search.html

➞

Show inline comments

@@ @@ -68,13 +68,13 @@ ${self.repo_context_bar('options')} @@
                     <input type="submit" value="${_('Search')}" class="btn btn-default"/>
                 </div>
             </div>
             <div class="form-group">
                 ## <label>${_('Status')}:</label>
-                <div style="font-weight: bold;clear:both">${c.runtime}</div>
                 <div>${c.runtime}</div>
             </div>
         </div>
         ${h.end_form()}
     </div>
     <div class="panel-body">
     %if c.cur_type == 'content':

kallithea/templates/summary/statistics.html

➞

Show inline comments

@@ @@ -22,33 +22,32 @@ ${self.repo_context_bar('summary')} @@
     <div class="panel panel-primary">
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <div class="graph panel-body">
-         <div style="padding:0 10px 10px 17px;">
          <div>
          %if c.no_data:
            ${c.no_data_msg}
            %if h.HasPermissionAny('hg.admin')('enable stats on from summary'):
                 ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name),class_="btn btn-default btn-xs")}
            %endif
         %else:
             ${_('Stats gathered: ')} ${c.stats_percentage}%
         %endif
         </div>
-        <div id="commit_history" style="width:450px;height:300px;float:left"></div>
+        <div id="commit_history" class="pull-left"></div>
-        <div id="legend_data" style="float: left;">
+        <div id="legend_data" class="pull-left">
             <div id="legend_container"></div>
             <div id="legend_choices">
-                <table class="table" id="legend_choices_tables" style="font-size:smaller;color:#545454"></table>
                 <table class="table" id="legend_choices_tables"></table>
             </div>
         </div>
         <div style="clear: both; height: 10px;"></div>
         <div id="overview" style="width: 450px; height: 100px; float: left;"></div>
         <div id="overview"></div>
     </div>
 </div>
 <script type="text/javascript">
 var data = ${h.js(c.trending_languages)};
 var total = 0;

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -109,13 +109,13 @@ ${self.repo_context_bar('summary')} @@
                     %endif
                 %else:
                     <span id="${'zip_link'}">
                         <a class="btn btn-default btn-sm" href="${h.url('files_archive_home',repo_name=c.db_repo.repo_name,fname='tip.zip')}"><i class="icon-file-zip"></i> ${_('Download as zip')}</a>
                     </span>
                     ${h.hidden('download_options')}
-                    <span style="vertical-align: bottom">
                     <span>
                       <label data-toggle="tooltip" title="${_('Check this to download archive with subrepos')}">
                           <input id="archive_subrepos" type="checkbox" name="subrepos" />
                           ${_('With subrepos')}
                       </label>
                     </span>
                 %endif

kallithea/tests/functional/test_forks.py

➞

Show inline comments

@@ @@ -241,13 +241,13 @@ class _BaseTestCase(TestController): @@
                                           perm='repository.read')
         Session().commit()
         response = self.app.get(url(controller='forks', action='forks',
                                     repo_name=repo_name))
-        response.mustcontain('<div style="padding:5px 3px 3px 42px;">fork of vcs test</div>')
         response.mustcontain('<div>fork of vcs test</div>')
     def test_zzz_fork_permission_page(self):
         usr = self.log_user(self.username, self.password)['user_id']
         repo_name = self.REPO
         forks = Repository.query() \

0 comments (0 inline, 0 general)