kallithea Changeset - b7654d1675da

Changeset - b7654d1675da

Parent rev.

Child rev.

[Not reviewed]

default

! ! !

domruf - 9 years ago 2016-09-18 19:39:36
dominikruf@gmail.com

style: in preparation for bootstrap, use bootstrap compatible button class names

Give all buttons a styling (default, success, danger, warning) and rename the sizes to sm and xs.

This is a subset of a bigger changeset. The subset was extracted by Mads Kiilerich, mostly by:

sed -i \
-e 's,btn btn-small,btn btn-default btn-sm,g' \
-e 's,btn btn-mini,btn btn-default btn-xs,g' \
-e 's,btn-default btn-\(xs\|sm\) btn-\(success\|danger\|warning\),btn-\2 btn-\1,g' \
-e 's,class_="btn",class_="btn btn-default",g' \
`hg mani`

77 files changed with 181 insertions and 181 deletions:

kallithea/public/css/style.css

kallithea/public/js/base.js

kallithea/templates/admin/admin.html

kallithea/templates/admin/auth/auth_settings.html

kallithea/templates/admin/defaults/defaults.html

kallithea/templates/admin/gists/edit.html

kallithea/templates/admin/gists/index.html

kallithea/templates/admin/gists/new.html

kallithea/templates/admin/gists/show.html

kallithea/templates/admin/my_account/my_account_api_keys.html

kallithea/templates/admin/my_account/my_account_emails.html

kallithea/templates/admin/my_account/my_account_password.html

kallithea/templates/admin/my_account/my_account_profile.html

kallithea/templates/admin/notifications/notifications.html

kallithea/templates/admin/permissions/permissions_globals.html

kallithea/templates/admin/permissions/permissions_ips.html

kallithea/templates/admin/repo_groups/repo_group_add.html

kallithea/templates/admin/repo_groups/repo_group_edit.html

kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html

kallithea/templates/admin/repo_groups/repo_group_edit_perms.html

kallithea/templates/admin/repo_groups/repo_group_edit_settings.html

kallithea/templates/admin/repo_groups/repo_groups.html

kallithea/templates/admin/repos/repo_add_base.html

kallithea/templates/admin/repos/repo_edit_advanced.html

kallithea/templates/admin/repos/repo_edit_caches.html

kallithea/templates/admin/repos/repo_edit_fields.html

kallithea/templates/admin/repos/repo_edit_permissions.html

kallithea/templates/admin/repos/repo_edit_remote.html

kallithea/templates/admin/repos/repo_edit_settings.html

kallithea/templates/admin/repos/repo_edit_statistics.html

kallithea/templates/admin/repos/repos.html

kallithea/templates/admin/settings/settings_email.html

kallithea/templates/admin/settings/settings_global.html

kallithea/templates/admin/settings/settings_hooks.html

kallithea/templates/admin/settings/settings_mapping.html

kallithea/templates/admin/settings/settings_search.html

kallithea/templates/admin/settings/settings_vcs.html

kallithea/templates/admin/settings/settings_visual.html

kallithea/templates/admin/user_groups/user_group_add.html

kallithea/templates/admin/user_groups/user_group_edit_advanced.html

kallithea/templates/admin/user_groups/user_group_edit_perms.html

kallithea/templates/admin/user_groups/user_group_edit_settings.html

kallithea/templates/admin/user_groups/user_groups.html

kallithea/templates/admin/users/user_add.html

kallithea/templates/admin/users/user_edit_advanced.html

kallithea/templates/admin/users/user_edit_api_keys.html

kallithea/templates/admin/users/user_edit_emails.html

kallithea/templates/admin/users/user_edit_ips.html

kallithea/templates/admin/users/user_edit_profile.html

kallithea/templates/admin/users/users.html

kallithea/templates/base/base.html

kallithea/templates/base/default_perms_box.html

kallithea/templates/changelog/changelog.html

kallithea/templates/changelog/changelog_summary_data.html

kallithea/templates/changeset/changeset_file_comment.html

kallithea/templates/changeset/changeset_range.html

kallithea/templates/compare/compare_diff.html

kallithea/templates/data_table/_dt_elements.html

kallithea/templates/files/files_add.html

kallithea/templates/files/files_browser.html

kallithea/templates/files/files_delete.html

kallithea/templates/files/files_edit.html

kallithea/templates/files/files_source.html

kallithea/templates/forks/fork.html

kallithea/templates/forks/forks_data.html

kallithea/templates/index_base.html

kallithea/templates/journal/journal.html

kallithea/templates/password_reset.html

kallithea/templates/password_reset_confirmation.html

kallithea/templates/pullrequests/pullrequest.html

kallithea/templates/pullrequests/pullrequest_show.html

kallithea/templates/pullrequests/pullrequest_show_all.html

kallithea/templates/register.html

kallithea/templates/summary/statistics.html

kallithea/templates/summary/summary.html

kallithea/tests/functional/test_admin_gists.py

kallithea/tests/functional/test_compare.py

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -3166,17 +3166,17 @@ input.btn { @@
 input[disabled].btn,
 .btn.disabled {
     color: #999;
+}
-.btn.btn-small {
+.btn.btn-sm {
     padding: 2px 6px;
+}
-.btn.btn-mini {
+.btn.btn-xs {
     padding: 0px 4px;
+}
 .btn:focus {
     outline: none;
+}

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -668,13 +668,13 @@ function comment_div_state($comment_div, @@
+    }
+}
 // append an Add button to $comment_div and hook it up to show form
 function _comment_div_append_add($comment_div, f_path, line_no) {
     var addlabel = TRANSLATION_MAP['Add Another Comment'];
-    var $add = $('<div class="add-button-row"><span class="btn btn-mini add-button">{0}</span></div>'.format(addlabel));
+    var $add = $('<div class="add-button-row"><span class="btn btn-default btn-xs add-button">{0}</span></div>'.format(addlabel));
     $comment_div.append($add);
     $add.children('.add-button').click(function(e) {
         comment_div_state($comment_div, f_path, line_no, true);
     });
+}

kallithea/templates/admin/admin.html

➞

Show inline comments

@@ @@ -6,13 +6,13 @@ @@
 </%block>
 <%def name="breadcrumbs_links()">
     <form id="filter_form">
     <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('journal filter...')}"/>
     <span class="tooltip" title="${h.journal_filter_help()}">?</span>
-    <input type='submit' value="${_('Filter')}" class="btn btn-mini" style="padding:0px 2px 0px 2px;margin:0px"/>
+    <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs" style="padding:0px 2px 0px 2px;margin:0px"/>
     ${_('Admin Journal')} - ${ungettext('%s Entry', '%s Entries', c.users_log.item_count) % (c.users_log.item_count)}
     </form>
     ${h.end_form()}
 </%def>
 <%block name="header_menu">

kallithea/templates/admin/auth/auth_settings.html

➞

Show inline comments

@@ @@ -33,13 +33,13 @@ @@
            <span class="help-block">${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}</span>
                <div style="padding:10px 0px 10px 0px;font-weight: bold">${_('Available built-in plugins')}</div>
                <ul>
                %for plugin_path in c.available_plugins:
                     <li>
                       <div style="padding:3px 0px 3px 0px">
-                          <span style="margin: 0px 10px 0px 0px" plugin_id="${plugin_path}" class="toggle-plugin btn btn-mini ${'active' if plugin_path in c.enabled_plugins else ''}">
+                          <span style="margin: 0px 10px 0px 0px" plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugins else ''}">
                           ${_('Enabled') if plugin_path in c.enabled_plugins else _('Disabled')}</span>${plugin_path}
                       </div>
                     </li>
                %endfor
                </ul>
            </div>
@@ @@ -95,13 +95,13 @@ @@
             %endif
         %endfor
         </div>
     %endfor
         <div class="fields">
             <div class="buttons">
                 ${h.submit('save',_('Save'),class_="btn")}
+                ${h.submit('save',_('Save'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>

kallithea/templates/admin/defaults/defaults.html

➞

Show inline comments

@@ @@ -76,13 +76,13 @@ @@
                     ${h.checkbox('default_repo_enable_locking',value="True")}
                     <span class="help-block">${_('Enable lock-by-pulling on repository.')}</span>
                 </div>
             </div>
             <div class="buttons">
             ${h.submit('save',_('Save'),class_="btn")}
+            ${h.submit('save',_('Save'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
     ##<h3>${_('Groups defaults')}</h3>

kallithea/templates/admin/gists/edit.html

➞

Show inline comments

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

kallithea/templates/admin/gists/index.html

➞

Show inline comments

@@ @@ -31,13 +31,13 @@ @@
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         %if c.authuser.username != 'default':
         <ul class="links">
           <li>
-             <a href="${h.url('new_gist')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Create New Gist')}</a>
+             <a href="${h.url('new_gist')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Create New Gist')}</a>
           </li>
         </ul>
         %endif
     </div>
     %if c.gists_pager.item_count>0:
         % for gist in c.gists_pager:

kallithea/templates/admin/gists/new.html

➞

Show inline comments

@@ @@ -48,15 +48,15 @@ @@
                 <div id="editor_container">
                     <pre id="editor_pre"></pre>
                     <textarea id="editor" name="content" style="display:none"></textarea>
                 </div>
             </div>
             <div style="padding-top: 5px">
             ${h.submit('private',_('Create Private Gist'),class_="btn btn-mini btn-success")}
             ${h.submit('public',_('Create Public Gist'),class_="btn btn-mini")}
             ${h.reset('reset',_('Reset'),class_="btn btn-mini")}
             ${h.submit('private',_('Create Private Gist'),class_="btn btn-success btn-xs")}
             ${h.submit('public',_('Create Public Gist'),class_="btn btn-default btn-xs")}
             ${h.reset('reset',_('Reset'),class_="btn btn-default btn-xs")}
             </div>
           ${h.end_form()}
           <script type="text/javascript">
             $(document).ready(function(){
                 var myCodeMirror = initCodeMirror('editor', "${request.script_name}", '');

kallithea/templates/admin/gists/show.html

➞

Show inline comments

@@ @@ -19,27 +19,27 @@ @@
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         %if c.authuser.username != 'default':
         <ul class="links">
           <li>
-              <a href="${h.url('new_gist')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Create New Gist')}</a>
+              <a href="${h.url('new_gist')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Create New Gist')}</a>
           </li>
         </ul>
         %endif
     </div>
     <div class="table">
         <div id="files_data">
             <div id="body" class="codeblock">
                 <div class="code-header">
                     <div class="stats">
                         <div class="left" style="margin: -4px 0px 0px 0px">
                           %if c.gist.gist_type == 'public':
-                            <div class="btn btn-mini btn-success disabled">${_('Public Gist')}</div>
+                            <div class="btn btn-success btn-xs disabled">${_('Public Gist')}</div>
                           %else:
-                            <div class="btn btn-mini btn-warning disabled">${_('Private Gist')}</div>
+                            <div class="btn btn-warning btn-xs disabled">${_('Private Gist')}</div>
                           %endif
                         </div>
                         <div class="left item">
                             ${c.gist.gist_description}
                         </div>
                         <div class="left item last" style="color: #AAA">
@@ @@ -50,22 +50,22 @@ @@
                          %endif
                        </div>
                        %if h.HasPermissionAny('hg.admin')() or c.gist.gist_owner == c.authuser.user_id:
                         <div style="float:right">
                             ${h.form(url('gist_delete', gist_id=c.gist.gist_id))}
-                                ${h.submit('remove_gist', _('Delete'),class_="btn btn-mini btn-danger",onclick="return confirm('"+_('Confirm to delete this Gist')+"');")}
+                                ${h.submit('remove_gist', _('Delete'),class_="btn btn-danger btn-xs",onclick="return confirm('"+_('Confirm to delete this Gist')+"');")}
                             ${h.end_form()}
                         </div>
                        %endif
                         <div class="buttons">
                           ## only owner should see that
                           %if h.HasPermissionAny('hg.admin')() or c.gist.gist_owner == c.authuser.user_id:
-                            ${h.link_to(_('Edit'),h.url('edit_gist', gist_id=c.gist.gist_access_id),class_="btn btn-mini")}
+                            ${h.link_to(_('Edit'),h.url('edit_gist', gist_id=c.gist.gist_access_id),class_="btn btn-default btn-xs")}
                           %endif
-                          ${h.link_to(_('Show as Raw'),h.url('formatted_gist', gist_id=c.gist.gist_access_id, format='raw'),class_="btn btn-mini")}
+                          ${h.link_to(_('Show as Raw'),h.url('formatted_gist', gist_id=c.gist.gist_access_id, format='raw'),class_="btn btn-default btn-xs")}
                         </div>
                     </div>
                     <div class="author">
                         ${h.gravatar_div(h.email_or_none(c.file_changeset.author), size=16)}
                         <div title="${c.file_changeset.author}" class="user">${h.person(c.file_changeset.author)} - ${_('created')} ${h.age(c.file_changeset.date)}</div>
@@ @@ -78,13 +78,13 @@ @@
                % for file in c.files:
                <div style="border: 1px solid #EEE;margin-top:20px">
                 <div id="${h.FID('G', file.path)}" class="stats" style="border-bottom: 1px solid #DDD;padding: 8px 14px;">
                     <a href="${c.gist.gist_url()}">¶</a>
                     <b style="margin:0px 0px 0px 4px">${h.safe_unicode(file.path)}</b>
                     <div style="float:right; margin: -5px">
-                       ${h.link_to(_('Show as raw'),h.url('formatted_gist_file', gist_id=c.gist.gist_access_id, format='raw', revision=file.changeset.raw_id, f_path=h.safe_unicode(file.path)),class_="btn btn-mini")}
+                       ${h.link_to(_('Show as raw'),h.url('formatted_gist_file', gist_id=c.gist.gist_access_id, format='raw', revision=file.changeset.raw_id, f_path=h.safe_unicode(file.path)),class_="btn btn-default btn-xs")}
                     </div>
                 </div>
                 <div class="code-body">
                     ${h.pygmentize(file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
                 </div>
               </div>

kallithea/templates/admin/my_account/my_account_api_keys.html

➞

Show inline comments

 <div class="apikeys_wrap">
   <table class="noborder">
     <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>
-            <span class="btn btn-mini btn-success disabled">${_('Built-in')}</span>
+            <span class="btn btn-success btn-xs disabled">${_('Built-in')}</span>
         </td>
         <td>${_('Expires')}: ${_('Never')}</td>
         <td>
             ${h.form(url('my_account_api_keys_delete'))}
                 ${h.hidden('del_api_key',c.user.api_key)}
                 ${h.hidden('del_api_key_builtin',1)}
-                <button class="btn btn-mini btn-danger" type="submit"
+                <button class="btn btn-danger btn-xs" type="submit"
                         onclick="return confirm('${_('Confirm to reset this API key: %s') % c.user.api_key}');">
                     ${_('Reset')}
                 </button>
             ${h.end_form()}
         </td>
     </tr>
@@ @@ -33,13 +33,13 @@ @@
                     %endif
                  %endif
             </td>
             <td>
                 ${h.form(url('my_account_api_keys_delete'))}
                     ${h.hidden('del_api_key',api_key.api_key)}
-                    <button class="btn btn-mini btn-danger" type="submit"
+                    <button class="btn btn-danger btn-xs" type="submit"
                             onclick="return confirm('${_('Confirm to remove this API key: %s') % api_key.api_key}');">
                         <i class="icon-minus-circled"></i>
                         ${_('Remove')}
                     </button>
                 ${h.end_form()}
             </td>
@@ @@ -63,14 +63,14 @@ @@
                 <div class="input">
                     ${h.text('description', class_='medium', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
               ${h.submit('save',_('Add'),class_="btn btn-default")}
               ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>

kallithea/templates/admin/my_account/my_account_emails.html

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ @@
     <tr>
     %if c.visual.use_gravatar:
     <td>${h.gravatar_div(c.user.email, size=16)}</td>
     %endif
     <td><div class="email">${c.user.email}</div></td>
     <td>
-        <span class="btn btn-mini btn-success disabled">${_('Primary')}</span>
+        <span class="btn btn-success btn-xs disabled">${_('Primary')}</span>
     </td>
     </tr>
     %if c.user_email_map:
         %for em in c.user_email_map:
           <tr>
             %if c.visual.use_gravatar:
@@ @@ -43,13 +43,13 @@ @@
                 </div>
                 <div class="input">
                     ${h.text('new_email', class_='medium')}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
               ${h.submit('save',_('Add'),class_="btn btn-default")}
               ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>

kallithea/templates/admin/my_account/my_account_password.html

➞

Show inline comments

@@ @@ -30,14 +30,14 @@ ${h.form(url('my_account_password'), met @@
         <div class="input">
             ${h.password('new_password_confirmation',class_='medium')}
         </div>
      </div>
         <div class="buttons">
           ${h.submit('save',_('Save'),class_="btn")}
           ${h.reset('reset',_('Reset'),class_="btn")}
           ${h.submit('save',_('Save'),class_="btn btn-default")}
           ${h.reset('reset',_('Reset'),class_="btn btn-default")}
         </div>
     </div>
 </div>
 ${h.end_form()}
 %else:

kallithea/templates/admin/my_account/my_account_profile.html

➞

Show inline comments

@@ @@ -52,12 +52,12 @@ ${h.form(url('my_account'), method='post @@
                 <div class="input">
                     ${h.text('email',class_="medium", readonly=c.readonly('email'))}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
               ${h.submit('save',_('Save'),class_="btn btn-default")}
               ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/notifications/notifications.html

➞

Show inline comments

@@ @@ -18,19 +18,19 @@ @@
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
       <div style="padding:14px 18px;text-align: right;float:left">
       <span id='all' class="btn btn-small"><a href="${h.url.current()}">${_('All')}</a></span>
       <span id='comment' class="btn btn-small"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>
       <span id='pull_request' class="btn btn-small"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span>
       <span id='all' class="btn btn-default btn-sm"><a href="${h.url.current()}">${_('All')}</a></span>
       <span id='comment' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.comment_type)}">${_('Comments')}</a></span>
       <span id='pull_request' class="btn btn-default btn-sm"><a href="${h.url.current(type=c.pull_request_type)}">${_('Pull Requests')}</a></span>
       </div>
       %if c.notifications:
       <div style="padding:14px 18px;text-align: right;float:right">
-      <span id='mark_all_read' class="btn btn-small">${_('Mark All Read')}</span>
+      <span id='mark_all_read' class="btn btn-default btn-sm">${_('Mark All Read')}</span>
       </div>
       %endif
   <div id='notification_data'>
     <%include file='notifications_data.html'/>
   </div>
 </div>

kallithea/templates/admin/permissions/permissions_globals.html

➞

Show inline comments

@@ @@ -106,12 +106,12 @@ ${h.form(url('admin_permissions'), metho @@
                 </div>
                 <div class="select">
                     ${h.select('default_extern_activate','',c.extern_activate_choices)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
               ${h.submit('save',_('Save'),class_="btn btn-default")}
               ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/permissions/permissions_ips.html

➞

Show inline comments

@@ @@ -32,12 +32,12 @@ ${h.form(url('edit_user_ips_update', id= @@
                 <div class="input">
                     ${h.hidden('default_user', 'True')}
                     ${h.text('new_ip', class_='medium')}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
               ${h.submit('save',_('Add'),class_="btn btn-default")}
               ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/repo_groups/repo_group_add.html

➞

Show inline comments

@@ @@ -63,13 +63,13 @@ @@
                     ${h.checkbox('group_copy_permissions',value="True")}
                     <span class="help-block">${_('Copy permission set from parent repository group.')}</span>
                 </div>
             </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
+              ${h.submit('save',_('Save'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>

kallithea/templates/admin/repo_groups/repo_group_edit.html

➞

Show inline comments

@@ @@ -15,13 +15,13 @@ @@
     &raquo; ${h.link_to(c.repo_group.name,h.url('repos_group_home',group_name=c.repo_group.group_name))}
 </%def>
 <%def name="breadcrumbs_side_links()">
     <ul class="links">
       <li>
-          <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Add Child Group')}</a>
+          <a href="${h.url('new_repos_group', parent_group=c.repo_group.group_id)}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add Child Group')}</a>
       </li>
     </ul>
 </%def>
 <%block name="header_menu">
     ${self.menu('admin')}

kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html

➞

Show inline comments

@@ @@ -14,13 +14,13 @@ @@
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
 %endfor
 </dl>
 ${h.form(h.url('delete_repos_group', group_name=c.repo_group.group_name))}
-    <button class="btn btn-small btn-danger" type="submit"
+    <button class="btn btn-danger btn-sm" type="submit"
             onclick="return confirm('${ungettext('Confirm to delete this group: %s with %s repository',
           'Confirm to delete this group: %s with %s repositories',
  c.repo_group.repositories_recursive_count) % (c.repo_group.group_name, c.repo_group.repositories_recursive_count)}');">
         <i class="icon-minus-circled"></i>
         ${_('Delete this repository group')}
     </button>

kallithea/templates/admin/repo_groups/repo_group_edit_perms.html

➞

Show inline comments

@@ @@ -108,14 +108,14 @@ ${h.form(url('edit_repo_group_perms', gr @@
                        <span class="help-block">${_('Set or revoke permission to all children of that group, including non-private repositories and other groups if selected.')}</span>
                     </td>
                 </tr>
             </table>
         </div>
         <div class="buttons">
           ${h.submit('save',_('Save'),class_="btn")}
           ${h.reset('reset',_('Reset'),class_="btn")}
           ${h.submit('save',_('Save'),class_="btn btn-default")}
           ${h.reset('reset',_('Reset'),class_="btn btn-default")}
         </div>
    </div>
 </div>
 ${h.end_form()}
 <script type="text/javascript">

kallithea/templates/admin/repo_groups/repo_group_edit_settings.html

➞

Show inline comments

@@ @@ -36,14 +36,14 @@ ${h.form(url('update_repos_group',group_ @@
             <div class="checkboxes">
                 ${h.checkbox('enable_locking',value="True")}
                 <span class="help-block">${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')}</span>
             </div>
         </div>
         <div class="buttons">
           ${h.submit('save',_('Save'),class_="btn")}
           ${h.reset('reset',_('Reset'),class_="btn")}
           ${h.submit('save',_('Save'),class_="btn btn-default")}
           ${h.reset('reset',_('Reset'),class_="btn btn-default")}
         </div>
     </div>
 </div>
 ${h.end_form()}
 ${h.form(url('delete_repo_group', group_name=c.repo_group.group_name))}

kallithea/templates/admin/repo_groups/repo_groups.html

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ @@
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
             %if h.HasPermissionAny('hg.admin')():
              <li>
-               <a href="${h.url('new_repos_group')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Add Repository Group')}</a>
+               <a href="${h.url('new_repos_group')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add Repository Group')}</a>
              </li>
             %endif
         </ul>
     </div>
     <!-- end box / title -->
     <div class="table">

kallithea/templates/admin/repos/repo_add_base.html

➞

Show inline comments

@@ @@ -75,13 +75,13 @@ ${h.form(url('repos'))} @@
             <div class="checkboxes">
                 ${h.checkbox('repo_private',value="True")}
                 <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
             </div>
         </div>
         <div class="buttons">
           ${h.submit('add',_('Add'),class_="btn")}
+          ${h.submit('add',_('Add'),class_="btn btn-default")}
         </div>
     </div>
 </div>
 <script>
     $(document).ready(function(){
         var setCopyPermsOption = function(group_val){

kallithea/templates/admin/repos/repo_edit_advanced.html

➞

Show inline comments

 <h3>${_('Parent')}</h3>
 ${h.form(url('edit_repo_advanced_fork', repo_name=c.repo_info.repo_name))}
 <div class="form">
        ${h.select('id_fork_of','',c.repos_list,class_="medium")}
-       ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="btn btn-small")}
+       ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="btn btn-default btn-sm")}
        <div class="field" style="border:none;color:#888">
        <ul>
             <li>${_('''Manually set this repository as a fork of another from the list.''')}</li>
        </ul>
        </div>
 </div>
@@ @@ -21,18 +21,18 @@ ${h.end_form()} @@
 <h3>${_('Public Journal Visibility')}</h3>
 ${h.form(url('edit_repo_advanced_journal', repo_name=c.repo_info.repo_name))}
 <div class="form">
   <div class="field">
   %if c.in_public_journal:
-    <button class="btn btn-small" type="submit">
+    <button class="btn btn-default btn-sm" type="submit">
         <i class="icon-minus"></i>
         ${_('Remove from public journal')}
     </button>
   %else:
-    <button class="btn btn-small" type="submit">
+    <button class="btn btn-default btn-sm" type="submit">
         <i class="icon-plus"></i>
         ${_('Add to Public Journal')}
     </button>
   %endif
   </div>
  <div class="field" style="border:none;color:#888">
@@ @@ -45,21 +45,21 @@ ${h.end_form()} @@
 <h3>${_('Change Locking')}</h3>
 ${h.form(url('edit_repo_advanced_locking', repo_name=c.repo_info.repo_name))}
 <div class="form">
       %if c.repo_info.locked[0]:
         ${h.hidden('set_unlock', '1')}
-        <button class="btn btn-small" type="submit"
+        <button class="btn btn-default btn-sm" type="submit"
                 onclick="return confirm('${_('Confirm to unlock repository.')}');">
             <i class="icon-lock-open-alt"></i>
             ${_('Unlock Repository')}
         </button>
        ${_('Locked by %s on %s') % (h.person_by_id(c.repo_info.locked[0]),h.fmt_date(h.time_to_datetime(c.repo_info.locked[1])))}
       %else:
         ${h.hidden('set_lock', '1')}
-        <button class="btn btn-small" type="submit"
+        <button class="btn btn-default btn-sm" type="submit"
                 onclick="return confirm('${_('Confirm to lock repository.')}');">
             <i class="icon-lock"></i>
             ${_('Lock Repository')}
         </button>
         ${_('Repository is not locked')}
       %endif
@@ @@ -72,13 +72,13 @@ ${h.form(url('edit_repo_advanced_locking @@
 </div>
 ${h.end_form()}
 <h3>${_('Delete')}</h3>
 ${h.form(url('delete_repo', repo_name=c.repo_name))}
 <div class="form">
-    <button class="btn btn-small btn-danger" type="submit"
+    <button class="btn btn-danger btn-sm" type="submit"
             onclick="return confirm('${_('Confirm to delete this repository: %s') % c.repo_name}');">
         <i class="icon-minus-circled"></i>
         ${_('Delete this Repository')}
     </button>
     %if c.repo_info.forks.count():
         ${ungettext('This repository has %s fork', 'This repository has %s forks', c.repo_info.forks.count()) % c.repo_info.forks.count()}

kallithea/templates/admin/repos/repo_edit_caches.html

➞

Show inline comments

 ${h.form(url('update_repo_caches', repo_name=c.repo_name))}
 <div class="form">
    <div class="fields">
-       ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate Repository Cache'),class_="btn btn-small")}
+       ${h.submit('reset_cache_%s' % c.repo_info.repo_name,_('Invalidate Repository Cache'),class_="btn btn-default btn-sm")}
       <div class="field" style="border:none;color:#888">
       <ul>
           <li>${_('Manually invalidate cache for this repository. On first access, the repository will be cached again.')}
           </li>
       </ul>
       </div>

kallithea/templates/admin/repos/repo_edit_fields.html

➞

Show inline comments

@@ @@ -52,14 +52,14 @@ @@
                 <div class="input">
                     ${h.text('new_field_desc', class_='small', placeholder=_('Enter description of a field'))}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
               ${h.submit('save',_('Add'),class_="btn btn-default")}
               ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 %else:
   <div style="font-size: 20px">

kallithea/templates/admin/repos/repo_edit_permissions.html

➞

Show inline comments

@@ @@ -95,14 +95,14 @@ ${h.form(url('edit_repo_perms_update', r @@
                         </span>
                     </td>
                 </tr>
             </table>
         </div>
         <div class="buttons">
           ${h.submit('save',_('Save'),class_="btn")}
           ${h.reset('reset',_('Reset'),class_="btn")}
           ${h.submit('save',_('Save'),class_="btn btn-default")}
           ${h.reset('reset',_('Reset'),class_="btn btn-default")}
         </div>
    </div>
 </div>
 ${h.end_form()}
 <script type="text/javascript">

kallithea/templates/admin/repos/repo_edit_remote.html

➞

Show inline comments

@@ @@ -4,13 +4,13 @@ @@
 </div>
 ${h.form(url('edit_repo_remote_update', repo_name=c.repo_name))}
 <div class="form">
     <div class="fields">
         ${h.submit('remote_pull_%s' % c.repo_info.repo_name,
             _('Pull Changes from Remote Repository'),
-            class_="btn btn-small",
+            class_="btn btn-default btn-sm",
             onclick="return confirm('"+_('Confirm to pull changes from remote repository.')+"');")}
     </div>
 </div>
 ${h.end_form()}
 %else:
   <div style="font-size: 20px">

kallithea/templates/admin/repos/repo_edit_settings.html

➞

Show inline comments

@@ @@ -121,14 +121,14 @@ ${h.form(url('update_repo', repo_name=c. @@
                         %endif
                     </div>
                  </div>
               %endfor
             %endif
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
               ${h.submit('save',_('Save'),class_="btn btn-default")}
               ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 <script>

kallithea/templates/admin/repos/repo_edit_statistics.html

➞

Show inline comments

@@ @@ -4,10 +4,10 @@ ${h.form(url('edit_repo_statistics_updat @@
        <div class="field" style="border:none;color:#888">
         <ul>
             <li>${_('Processed commits')}: ${c.stats_revision}/${c.repo_last_rev}</li>
             <li>${_('Processed progress')}: ${c.stats_percentage}%</li>
         </ul>
        </div>
-        ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset Statistics'),class_="btn btn-small",onclick="return confirm('"+_('Confirm to remove current statistics.')+"');")}
+        ${h.submit('reset_stats_%s' % c.repo_info.repo_name,_('Reset Statistics'),class_="btn btn-default btn-sm",onclick="return confirm('"+_('Confirm to remove current statistics.')+"');")}
    </div>
 </div>
 ${h.end_form()}

kallithea/templates/admin/repos/repos.html

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ @@
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
          %if h.HasPermissionAny('hg.admin','hg.create.repository')():
           <li>
-            <a href="${h.url('new_repo')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Add Repository')}</a>
+            <a href="${h.url('new_repo')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add Repository')}</a>
           </li>
          %endif
         </ul>
     </div>
     <div class="table">
         <table id="datatable_list_wrap"></table>

kallithea/templates/admin/settings/settings_email.html

➞

Show inline comments

@@ @@ -9,11 +9,11 @@ ${h.form(url('admin_settings_email'), me @@
                 <div class="input">
                     ${h.text('test_email',size=30)}
                 </div>
             </div>
             <div class="buttons">
             ${h.submit('send',_('Send'),class_="btn")}
+            ${h.submit('send',_('Send'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/settings/settings_global.html

➞

Show inline comments

@@ @@ -55,12 +55,12 @@ ${h.form(url('admin_settings_global'), m @@
                     ${h.text('captcha_private_key',size=60)}
                     <span class="help-block">${_('Private key for reCaptcha system. Setting this value will enable captcha on registration.')}</span>
                 </div>
             </div>
             <div class="buttons">
                 ${h.submit('save',_('Save Settings'),class_="btn")}
                 ${h.reset('reset',_('Reset'),class_="btn")}
                 ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
                 ${h.reset('reset',_('Reset'),class_="btn btn-default")}
            </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/settings/settings_hooks.html

➞

Show inline comments

@@ @@ -47,13 +47,13 @@ ${h.form(url('admin_settings_hooks'), me @@
         </div>
         <div class="input" style="margin-left:280px">
             ${h.text('new_hook_ui_value',size=60)}
         </div>
       </div>
       <div class="buttons" style="margin-left:280px">
          ${h.submit('save',_('Save'),class_="btn")}
+         ${h.submit('save',_('Save'),class_="btn btn-default")}
       </div>
     </div>
 </div>
 ${h.end_form()}
 % endif

kallithea/templates/admin/settings/settings_mapping.html

➞

Show inline comments

@@ @@ -29,11 +29,11 @@ ${h.form(url('admin_settings_mapping'), @@
                     </div>
                     <span class="help-block">${_("If installing Git hooks, overwrite any existing hooks, even if they do not seem to come from Kallithea. WARNING: This operation will destroy any custom git hooks you may have deployed by hand!")}</span>
                 </div>
             </div>
             <div class="buttons">
             ${h.submit('rescan',_('Rescan Repositories'),class_="btn")}
+            ${h.submit('rescan',_('Rescan Repositories'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/settings/settings_search.html

➞

Show inline comments

@@ @@ -15,11 +15,11 @@ ${h.form(url('admin_settings_search'), m @@
                     <span class="help-block">${_('This option completely reindexeses all of the repositories for proper fulltext search capabilities.')}</span>
                 </div>
             </div>
             <div class="buttons">
             ${h.submit('reindex',_('Reindex'),class_="btn")}
+            ${h.submit('reindex',_('Reindex'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/settings/settings_vcs.html

➞

Show inline comments

@@ @@ -51,24 +51,24 @@ ${h.form(url('admin_settings'), method=' @@
                     <label for="paths_root_path">${_('Location of repositories')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('paths_root_path',size=60,readonly="readonly")}
                     <span id="path_unlock" class="tooltip" style="cursor: pointer"
                             title="${_('Click to unlock. You must restart Kallithea in order to make this setting take effect.')}">
-                        <div class="btn btn-small"><i id="path_unlock_icon" class="icon-lock"></i></div>
+                        <div class="btn btn-default btn-sm"><i id="path_unlock_icon" class="icon-lock"></i></div>
                     </span>
                     <span class="help-block">${_('Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required.')}</span>
                 </div>
             </div>
             %else:
             ## form still requires this but we cannot internally change it anyway
             ${h.hidden('paths_root_path',size=30,readonly="readonly")}
             %endif
             <div class="buttons">
                 ${h.submit('save',_('Save Settings'),class_="btn")}
                 ${h.reset('reset',_('Reset'),class_="btn")}
                 ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
                 ${h.reset('reset',_('Reset'),class_="btn btn-default")}
            </div>
         </div>
     </div>
     ${h.end_form()}
     <script type="text/javascript">

kallithea/templates/admin/settings/settings_visual.html

➞

Show inline comments

@@ @@ -113,13 +113,13 @@ ${h.form(url('admin_settings_visual'), m @@
                     </div>
                     <span class="help-block">${_('Parses meta tags from the repository description field and turns them into colored tags.')}</span>
                  </div>
              </div>
              <div class="buttons">
                  ${h.submit('save',_('Save Settings'),class_="btn")}
                  ${h.reset('reset',_('Reset'),class_="btn")}
                  ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
                  ${h.reset('reset',_('Reset'),class_="btn btn-default")}
              </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/user_groups/user_group_add.html

➞

Show inline comments

@@ @@ -51,13 +51,13 @@ @@
                 <div class="checkboxes">
                     ${h.checkbox('users_group_active',value=True, checked='checked')}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
+              ${h.submit('save',_('Save'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>

kallithea/templates/admin/user_groups/user_group_edit_advanced.html

➞

Show inline comments

@@ @@ -12,12 +12,12 @@ @@
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
 %endfor
 </dl>
 ${h.form(h.url('delete_users_group', id=c.user_group.users_group_id))}
-    <button class="btn btn-small btn-danger" type="submit"
+    <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}');">
         <i class="icon-minus-circled"></i>
         ${_('Delete this user group')}
     </button>
 ${h.end_form()}

kallithea/templates/admin/user_groups/user_group_edit_perms.html

➞

Show inline comments

@@ @@ -98,14 +98,14 @@ ${h.form(url('edit_user_group_perms_upda @@
                         </span>
                     </td>
                 </tr>
             </table>
         </div>
         <div class="buttons">
           ${h.submit('save',_('Save'),class_="btn")}
           ${h.reset('reset',_('Reset'),class_="btn")}
           ${h.submit('save',_('Save'),class_="btn btn-default")}
           ${h.reset('reset',_('Reset'),class_="btn btn-default")}
         </div>
    </div>
 </div>
 ${h.end_form()}
 <script type="text/javascript">

kallithea/templates/admin/user_groups/user_group_edit_settings.html

➞

Show inline comments

@@ @@ -54,13 +54,13 @@ ${h.form(url('update_users_group', id=c. @@
                                 </tr>
                         </table>
                     </div>
                 </div>
                 <div class="buttons">
                   ${h.submit('Save',_('Save'),class_="btn")}
+                  ${h.submit('Save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
     </div>
 ${h.end_form()}
 <script type="text/javascript">
   MultiSelectWidget('users_group_members','available_members','edit_users_group');

kallithea/templates/admin/user_groups/user_groups.html

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ @@
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
         %if h.HasPermissionAny('hg.admin', 'hg.usergroup.create.true')():
           <li>
-            <a href="${h.url('new_users_group')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Add User Group')}</a>
+            <a href="${h.url('new_users_group')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add User Group')}</a>
           </li>
         %endif
         </ul>
     </div>
     <!-- end box / title -->
     <div class="table">

kallithea/templates/admin/users/user_add.html

➞

Show inline comments

@@ @@ -90,13 +90,13 @@ @@
                 </div>
              </div>
             ${h.hidden('extern_type', c.default_extern_type)}
             ${h.hidden('extern_name', c.default_extern_name)}
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
+              ${h.submit('save',_('Save'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>

kallithea/templates/admin/users/user_edit_advanced.html

➞

Show inline comments

@@ @@ -14,12 +14,12 @@ @@
   <dt style="width:150px; text-align: left">${dt}:</dt>
   <dd style="margin-left: 160px" title="${tt}">${dd}</dd>
 %endfor
 </dl>
 ${h.form(h.url('delete_user', id=c.user.user_id))}
-    <button class="btn btn-small btn-danger" type="submit"
+    <button class="btn btn-danger btn-sm" type="submit"
             onclick="return confirm('${_('Confirm to delete this user: %s') % c.user.username}');">
         <i class="icon-minus-circled"></i>
         ${_('Delete this user')}
     </button>
 ${h.end_form()}

kallithea/templates/admin/users/user_edit_api_keys.html

➞

Show inline comments

 <div class="apikeys_wrap">
   <table class="noborder">
     <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>
-            <span class="btn btn-mini btn-success disabled">${_('Built-in')}</span>
+            <span class="btn btn-success btn-xs disabled">${_('Built-in')}</span>
         </td>
         <td>${_('Expires')}: ${_('Never')}</td>
         <td>
             ${h.form(url('edit_user_api_keys_delete', id=c.user.user_id))}
                 ${h.hidden('del_api_key',c.user.api_key)}
                 ${h.hidden('del_api_key_builtin',1)}
-                <button class="btn btn-mini btn-danger" type="submit"
+                <button class="btn btn-danger btn-xs" type="submit"
                         onclick="return confirm('${_('Confirm to reset this API key: %s') % c.user.api_key}');">
                     ${_('Reset')}
                 </button>
             ${h.end_form()}
         </td>
     </tr>
@@ @@ -33,13 +33,13 @@ @@
                     %endif
                  %endif
             </td>
             <td>
                 ${h.form(url('edit_user_api_keys_delete', id=c.user.user_id))}
                     ${h.hidden('del_api_key',api_key.api_key)}
-                    <button class="btn btn-mini btn-danger" type="submit"
+                    <button class="btn btn-danger btn-xs" type="submit"
                             onclick="return confirm('${_('Confirm to remove this API key: %s') % api_key.api_key}');">
                         <i class="icon-minus-circled"></i>
                         ${_('Remove')}
                     </button>
                 ${h.end_form()}
             </td>
@@ @@ -63,14 +63,14 @@ @@
                 <div class="input">
                     ${h.text('description', class_='medium', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
               ${h.submit('save',_('Add'),class_="btn btn-default")}
               ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>

kallithea/templates/admin/users/user_edit_emails.html

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ @@
     <tr>
     %if c.visual.use_gravatar:
     <td>${h.gravatar_div(c.user.email, size=16)}</td>
     %endif
     <td><div class="email">${c.user.email}</div></td>
     <td>
-        <span class="btn btn-mini btn-success disabled">${_('Primary')}</span>
+        <span class="btn btn-success btn-xs disabled">${_('Primary')}</span>
     </td>
     </tr>
     %if c.user_email_map:
         %for em in c.user_email_map:
           <tr>
             %if c.visual.use_gravatar:
@@ @@ -43,13 +43,13 @@ @@
                 </div>
                 <div class="input">
                     ${h.text('new_email', class_='medium')}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
               ${h.submit('save',_('Add'),class_="btn btn-default")}
               ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>

kallithea/templates/admin/users/user_edit_ips.html

➞

Show inline comments

@@ @@ -43,13 +43,13 @@ @@
                 </div>
                 <div class="input">
                     ${h.text('new_ip', class_='medium')}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Add'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
               ${h.submit('save',_('Add'),class_="btn btn-default")}
               ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>

kallithea/templates/admin/users/user_edit_profile.html

➞

Show inline comments

@@ @@ -107,12 +107,12 @@ ${h.form(url('update_user', id=c.user.us @@
                 <div class="checkboxes">
                     ${h.checkbox('admin',value=True, readonly=c.readonly('admin'))}
                 </div>
              </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
               ${h.submit('save',_('Save'),class_="btn btn-default")}
               ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
 </div>
 ${h.end_form()}

kallithea/templates/admin/users/users.html

➞

Show inline comments

@@ @@ -17,13 +17,13 @@ @@
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
-            <a href="${h.url('new_user')}" class="btn btn-small btn-success"><i class="icon-plus"></i> ${_('Add User')}</a>
+            <a href="${h.url('new_user')}" class="btn btn-success btn-sm"><i class="icon-plus"></i> ${_('Add User')}</a>
           </li>
         </ul>
     </div>
     <!-- end box / title -->
     <div class="table">
         <table id="datatable_list_wrap"></table>

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -406,13 +406,13 @@ @@
                         <div class="register">
                         %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                          ${h.link_to(_("Don't have an account ?"),h.url('register'))}
                         %endif
                         </div>
                         <div class="submit">
-                            ${h.submit('sign_in',_('Log In'),class_="btn btn-mini")}
+                            ${h.submit('sign_in',_('Log In'),class_="btn btn-default btn-xs")}
                         </div>
                     </div>
                 </div>
             </div>
             ${h.end_form()}
           %else:

kallithea/templates/base/default_perms_box.html

➞

Show inline comments

@@ @@ -58,14 +58,14 @@ ${h.form(form_url)} @@
                     </span>
                 </div>
              </div>
             </div>
             <div class="buttons">
               ${h.submit('save',_('Save'),class_="btn")}
               ${h.reset('reset',_('Reset'),class_="btn")}
               ${h.submit('save',_('Save'),class_="btn btn-default")}
               ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 ${h.end_form()}
 ## JS

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -36,36 +36,36 @@ ${self.repo_context_bar('changelog', c.f @@
         % if c.pagination:
             <div>
                 <div style="overflow:auto; ${'display:none' if c.changelog_for_path else ''}">
                     <div class="container_header">
                         <div style="float:left; margin-left:20px;">
                           ${h.form(h.url.current(),method='get',style="display:inline")}
-                            ${h.submit('set',_('Show'),class_="btn btn-small")}
+                            ${h.submit('set',_('Show'),class_="btn btn-default btn-sm")}
                             ${h.text('size',size=3,value=c.size)}
                             ${_('revisions')}
                             %if c.branch_name:
                             ${h.hidden('branch', c.branch_name)}
                             %endif
                           ${h.end_form()}
-                          <a href="#" class="btn btn-small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
+                          <a href="#" class="btn btn-default btn-sm" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
                         </div>
                         <div style="float: right; margin: 0px 0px 0px 4px">
-                            <a href="#" class="btn btn-small" id="rev_range_container" style="display:none"></a>
+                            <a href="#" class="btn btn-default btn-sm" id="rev_range_container" style="display:none"></a>
                             %if c.revision:
-                                <a class="btn btn-small" href="${h.url('changelog_home', repo_name=c.repo_name)}">
+                                <a class="btn btn-default btn-sm" href="${h.url('changelog_home', repo_name=c.repo_name)}">
                                     ${_('Go to tip of repository')}
                                 </a>
                             %endif
                             %if c.db_repo.fork:
                                 <a id="compare_fork"
                                    title="${_('Compare fork with %s' % c.db_repo.fork.repo_name)}"
                                    href="${h.url('compare_url',repo_name=c.db_repo.fork.repo_name,org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=c.repo_name,other_ref_type='branch' if request.GET.get('branch') else c.db_repo.landing_rev[0],other_ref_name=request.GET.get('branch') or c.db_repo.landing_rev[1], merge=1)}"
-                                   class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)}</a>
+                                   class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare fork with parent repository (%s)' % c.db_repo.fork.repo_name)}</a>
                             %endif
                             ## text and href of open_new_pr is controlled from javascript
-                            <a id="open_new_pr" class="btn btn-small"></a>
+                            <a id="open_new_pr" class="btn btn-default btn-sm"></a>
                             ${_("Branch filter:")} ${h.select('branch_filter',c.branch_name,c.branch_filters)}
                         </div>
                     </div>
                 </div>
                 <div id="changelog" style="clear:both">

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -81,13 +81,13 @@ ${c.repo_changesets.pager('$link_previou @@
 %else:
 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
 <h4>${_('Add or upload files directly via Kallithea')}</h4>
 <div style="margin: 20px 30px;">
   <div id="add_node_id" class="add_node">
-      <a class="btn btn-mini" href="${h.url('files_add_home',repo_name=c.repo_name,revision=0,f_path='', anchor='edit')}">${_('Add New File')}</a>
+      <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
 <h4>${_('Push new repository')}</h4>

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 == c.authuser.user_id or h.HasRepoPermissionAny('repository.admin')(c.repo_name):
             %if co.deletable():
-              <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-mini" style="margin:0 5px">${_('Delete')}</div>
+              <div onClick="confirm('${_("Delete comment?")}') && deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-default btn-xs" style="margin:0 5px">${_('Delete')}</div>
             %endif
           %endif
       </div>
       <div class="text">
         %if co.status_change:
            <div class="automatic-comment">
@@ @@ -96,25 +96,25 @@ @@
                 %endif
         </div>
       </div>
       <div class="comment-button">
         <div class="submitting-overlay">${_('Submitting ...')}</div>
         ${h.submit('save', _('Comment'), class_='btn btn-small save-inline-form')}
         ${h.reset('hide-inline-form', _('Cancel'), class_='btn btn-small hide-inline-form')}
         ${h.submit('save', _('Comment'), class_='btn btn-default btn-sm save-inline-form')}
         ${h.reset('hide-inline-form', _('Cancel'), class_='btn btn-default btn-sm hide-inline-form')}
       </div>
     ${h.end_form()}
   %else:
       ${h.form('')}
       <div class="clearfix">
           <div class="comment-help">
             ${_('You need to be logged in to comment.')} <a href="${h.url('login_home', came_from=request.path_qs)}">${_('Login now')}</a>
           </div>
       </div>
       <div class="comment-button">
-      ${h.reset('hide-inline-form', _('Hide'), class_='btn btn-small hide-inline-form')}
+      ${h.reset('hide-inline-form', _('Hide'), class_='btn btn-default btn-sm hide-inline-form')}
       </div>
       ${h.end_form()}
   %endif
   </div>
 </div>
 </%def>

kallithea/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -27,13 +27,13 @@ ${self.repo_context_bar('changelog')} @@
         <div id="body" class="diffblock">
             <div class="code-header">
                 <div>
                     ${h.show_id(c.cs_ranges[0])}
                     <i class="icon-right"></i>
                     ${h.show_id(c.cs_ranges[-1])}
-                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-small"><i class="icon-git-compare"></i> Compare Revisions</a>
+                    <a style="font-weight: bold" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref_name=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref_name=c.cs_ranges[-1].raw_id)}" class="btn btn-default btn-sm"><i class="icon-git-compare"></i> Compare Revisions</a>
                 </div>
             </div>
         </div>
         <div id="changeset_compare_view_content">
             <div class="container">
             <table class="compare_view_commits noborder">

kallithea/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -33,15 +33,15 @@ ${self.repo_context_bar('changelog')} @@
                 </div><div>
                     <i class="icon-right"></i>
                 </div><div>
                     ${h.hidden('compare_other')}
                 </div><div>
                     %if not c.compare_home:
-                        <a class="btn btn-small" href="${c.swap_url}"><i class="icon-arrows-cw"></i> ${_('Swap')}</a>
+                        <a class="btn btn-default btn-sm" href="${c.swap_url}"><i class="icon-arrows-cw"></i> ${_('Swap')}</a>
                     %endif
-                    <div id="compare_revs" class="btn btn-small"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</div>
+                    <div id="compare_revs" class="btn btn-default btn-sm"><i class="icon-git-compare"></i> ${_('Compare Revisions')}</div>
                 </div>
             </div>
         </div>
     %if c.compare_home:
         <div id="changeset_compare_view_content">

kallithea/templates/data_table/_dt_elements.html

➞

Show inline comments

@@ @@ -133,17 +133,17 @@ @@
   </div>
 </%def>
 <%def name="repo_state(repo_state)">
   <div>
     %if repo_state == u'repo_state_pending':
-        <div class="btn btn-mini btn-info disabled">${_('Creating')}</div>
+        <div class="btn btn-default btn-xs btn-info disabled">${_('Creating')}</div>
     %elif repo_state == u'repo_state_created':
-        <div class="btn btn-mini btn-success disabled">${_('Created')}</div>
+        <div class="btn btn-success btn-xs disabled">${_('Created')}</div>
     %else:
-        <div class="btn btn-mini btn-danger disabled" title="${repo_state}">invalid</div>
+        <div class="btn btn-danger btn-xs disabled" title="${repo_state}">invalid</div>
     %endif
   </div>
 </%def>
 <%def name="user_actions(user_id, username)">
  <div style="float:left" class="grid_edit">

kallithea/templates/files/files_add.html

➞

Show inline comments

@@ @@ -38,17 +38,17 @@ ${self.repo_context_bar('files')} @@
           ${h.form(h.url.current(),method='post',id='eform',enctype="multipart/form-data", class_="form-horizontal")}
           <h3 class="files_location">
             ${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cs.raw_id,c.f_path)} /
               <span id="filename_container" class="file reviewer_ac">
                   <input class="input-small" type="text" value="" size="30" name="filename" id="filename" placeholder="${_('Enter filename...')}">
                   <input type="hidden" value="${c.f_path}" size="30" name="location" id="location">
-                  ${_('or')} <div class="btn btn-small" id="upload_file_enable">${_('Upload File')}</div>
+                  ${_('or')} <div class="btn btn-default btn-sm" id="upload_file_enable">${_('Upload File')}</div>
               </span>
               <span id="upload_file_container" class="reviewer_ac" style="display:none">
                   <input type="file" size="20" name="upload_file" id="upload_file">
-                  ${_('or')} <div class="btn btn-small" id="file_enable">${_('Create New File')}</div>
+                  ${_('or')} <div class="btn btn-default btn-sm" id="file_enable">${_('Create New File')}</div>
               </span>
           </h3>
             <div id="body" class="codeblock">
             <div class="code-header" id="mimetype_header">
                 <label class="commit" for="mimetype">${_('New file type')}</label>
                 <select id="mimetype" name="mimetype"/>
@@ @@ -58,14 +58,14 @@ ${self.repo_context_bar('files')} @@
                     <textarea id="editor" name="content" style="display:none"></textarea>
                 </div>
                 <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>
                 <textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>
             </div>
             <div style="text-align: left;padding-top: 5px">
             ${h.submit('commit',_('Commit Changes'),class_="btn btn-small btn-success")}
             ${h.reset('reset',_('Reset'),class_="btn btn-small")}
             ${h.submit('commit',_('Commit Changes'),class_="btn btn-success btn-sm")}
             ${h.reset('reset',_('Reset'),class_="btn btn-default btn-sm")}
             </div>
             ${h.end_form()}
             <script type="text/javascript">
                 $(document).ready(function(){
                     var reset_url = "${h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path)}";
                     var myCodeMirror = initCodeMirror('editor', "${request.script_name}", reset_url);

kallithea/templates/files/files_browser.html

➞

Show inline comments

@@ @@ -27,24 +27,24 @@ @@
 <div id="body" class="browserblock">
     <div class="browser-header">
         <div class="browser-nav">
             ${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-mini ypjax-link" href="${c.url_prev}" title="${_('Previous revision')}"><i class="icon-left-open"></i></a></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)}</div>
-              <div class="info_box_elem"><a class="btn btn-mini ypjax-link" href="${c.url_next}" title="${_('Next revision')}"><i class="icon-right-open"></i></a></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>
             </div>
             ${h.end_form()}
         </div>
         <div class="browser-branch">
            ${h.checkbox('stay_at_branch',c.changeset.branch,c.changeset.branch==c.branch)}
            <label>${_('Follow current branch')}</label>
         </div>
         <div id="search_activate_id" class="search_activate">
-           <a class="btn btn-mini" id="filter_activate" href="#">${_('Search File List')}</a>
+           <a class="btn btn-default btn-xs" id="filter_activate" href="#">${_('Search File List')}</a>
         </div>
         <div class="browser-search">
             <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" type="text" value="type to search..." name="filter" size="25" id="node_filter">

kallithea/templates/files/files_delete.html

➞

Show inline comments

@@ @@ -37,14 +37,14 @@ ${self.repo_context_bar('files')} @@
                     <textarea id="editor" name="content" style="display:none"></textarea>
                 </div>
                 <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>
                 <textarea id="commit" name="message" style="height: 100px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>
             </div>
             <div style="text-align: left;padding-top: 5px">
                 ${h.submit('commit',_('Commit Changes'),class_="btn btn-small btn-success")}
                 ${h.reset('reset',_('Reset'),class_="btn btn-small")}
                 ${h.submit('commit',_('Commit Changes'),class_="btn btn-success btn-sm")}
                 ${h.reset('reset',_('Reset'),class_="btn btn-default btn-sm")}
             </div>
             ${h.end_form()}
         </div>
     </div>
 </div>
 </%def>

kallithea/templates/files/files_edit.html

➞

Show inline comments

@@ @@ -42,18 +42,18 @@ ${self.repo_context_bar('files')} @@
                 <div class="stats">
                     <div class="left"><i class="icon-doc-inv"></i></div>
                     <div class="left item">${h.link_to(h.show_id(c.file.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</div>
                     <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div>
                     <div class="left item last">${c.file.mimetype}</div>
                     <div class="buttons">
                       ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-mini")}
                       ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-mini")}
                       ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-mini")}
                       ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                       ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                       ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                       % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                        % if not c.file.is_binary:
-                        ${h.link_to(_('Source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-mini")}
+                        ${h.link_to(_('Source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
                        % endif
                       % endif
                     </div>
                 </div>
                 <label class="commit" for="mimetype">${_('Editing file')}: ${c.file.unicode_path}</label>
                 <select id="mimetype" name="mimetype"/>
@@ @@ -61,14 +61,14 @@ ${self.repo_context_bar('files')} @@
                 <pre id="editor_pre"></pre>
                 <textarea id="editor" name="content" style="display:none">${h.escape(c.file.content)|n}</textarea>
                 <div style="padding: 10px;color:#666666">${_('Commit Message')}</div>
                 <textarea id="commit" name="message" style="height: 60px;width: 99%;margin-left:4px" placeholder="${c.default_message}"></textarea>
             </div>
             <div style="text-align: left;padding-top: 5px">
             ${h.submit('commit',_('Commit Changes'),class_="btn btn-small btn-success")}
             ${h.reset('reset',_('Reset'),class_="btn btn-small")}
             ${h.submit('commit',_('Commit Changes'),class_="btn btn-success btn-sm")}
             ${h.reset('reset',_('Reset'),class_="btn btn-default btn-sm")}
             </div>
             ${h.end_form()}
         </div>
     </div>
 </div>

kallithea/templates/files/files_source.html

➞

Show inline comments

 <div id="node_history" style="padding: 0px 0px 10px 0px">
     <div>
         <div style="float: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-small")}
         ${h.submit('show_rev',_('Show at Revision'),class_="btn btn-small")}
         ${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-small")}
         ${h.link_to(_('Show Authors'),'#',class_="btn btn-small" ,id="show_authors")}
         ${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>
     <div style="clear:both"></div>
@@ @@ -24,28 +24,28 @@ @@
             <div class="left img"><i class="icon-doc-inv"></i></div>
             <div class="left item"><pre class="tooltip" title="${h.fmt_date(c.changeset.date)}">${h.link_to(h.show_id(c.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</pre></div>
             <div class="left item"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div>
             <div class="left item last"><pre>${c.file.mimetype}</pre></div>
             <div class="buttons">
               %if c.annotate:
-                ${h.link_to(_('Show Source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-mini")}
+                ${h.link_to(_('Show Source'),    h.url('files_home',         repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
               %else:
-                ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-mini")}
+                ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
               %endif
               ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-mini")}
               ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-mini")}
               ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
               ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-default btn-xs")}
               % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                %if c.on_branch_head and not c.file.is_binary:
                 ${h.link_to(_('Edit on Branch: %s') % c.changeset.branch, h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-mini")}
                 ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-mini btn-danger")}
                 ${h.link_to(_('Edit on Branch: %s') % c.changeset.branch, h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-default btn-xs")}
                 ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-danger btn-xs")}
                %elif c.on_branch_head and c.file.is_binary:
                 ${h.link_to(_('Edit'), '#', class_="btn btn-mini disabled tooltip", title=_('Editing binary files not allowed'))}
                 ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-mini btn-danger")}
                 ${h.link_to(_('Edit'), '#', class_="btn btn-default btn-xs disabled tooltip", title=_('Editing binary files not allowed'))}
                 ${h.link_to(_('Delete'), h.url('files_delete_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-danger btn-xs")}
                %else:
                 ${h.link_to(_('Edit'), '#', class_="btn btn-mini disabled tooltip", title=_('Editing files allowed only when on branch head revision'))}
                 ${h.link_to(_('Delete'), '#', class_="btn btn-mini btn-danger disabled tooltip", title=_('Deleting files allowed only when on branch head revision'))}
                 ${h.link_to(_('Edit'), '#', class_="btn btn-default btn-xs disabled tooltip", title=_('Editing files allowed only when on branch head revision'))}
                 ${h.link_to(_('Delete'), '#', class_="btn btn-danger btn-xs disabled tooltip", title=_('Deleting files allowed only when on branch head revision'))}
                % endif
               % endif
             </div>
         </div>
         <div class="author">
             ${h.gravatar_div(h.email_or_none(c.changeset.author), size=16)}

kallithea/templates/forks/fork.html

➞

Show inline comments

@@ @@ -90,13 +90,13 @@ ${self.repo_context_bar('createfork')} @@
                     ${h.checkbox('update_after_clone',value="True")}
                     <span class="help-block">${_('Checkout source after making a clone')}</span>
                 </div>
             </div>
             %endif
             <div class="buttons">
                 ${h.submit('',_('Fork this Repository'),class_="btn")}
+                ${h.submit('',_('Fork this Repository'),class_="btn btn-default")}
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>

kallithea/templates/forks/forks_data.html

➞

Show inline comments

@@ @@ -13,13 +13,13 @@ @@
             </div>
             <div style="clear:both;padding-top: 10px"></div>
             <div class="follower_date">${_('Forked')} -
                 <span class="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-small"><i class="icon-git-compare"></i> ${_('Compare Fork')}</a>
+                   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
   <div class="pagination-wh pagination-left">
   ${c.forks_pager.pager('$link_previous ~2~ $link_next')}

kallithea/templates/index_base.html

➞

Show inline comments

@@ @@ -11,25 +11,25 @@ @@
                     create_on_write = h.HasPermissionAny('hg.create.write_on_repogroup.true')()
                     group_admin = h.HasRepoGroupPermissionAny('group.admin')(gr_name, 'can write into group index page')
                     group_write = h.HasRepoGroupPermissionAny('group.write')(gr_name, 'can write into group index page')
                 %>
                 %if h.HasPermissionAny('hg.admin','hg.create.repository')() or (group_admin or (group_write and create_on_write)):
                   %if c.group:
-                        <a href="${h.url('new_repo',parent_group=c.group.group_id)}" class="btn btn-small"><i class="icon-plus"></i> ${_('Add Repository')}</a>
+                        <a href="${h.url('new_repo',parent_group=c.group.group_id)}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository')}</a>
                         %if h.HasPermissionAny('hg.admin')() or h.HasRepoGroupPermissionAny('group.admin')(c.group.group_name):
-                            <a href="${h.url('new_repos_group', parent_group=c.group.group_id)}" class="btn btn-small"><i class="icon-plus"></i> ${_('Add Repository Group')}</a>
+                            <a href="${h.url('new_repos_group', parent_group=c.group.group_id)}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository Group')}</a>
                         %endif
                   %else:
-                    <a href="${h.url('new_repo')}" class="btn btn-small"><i class="icon-plus"></i> ${_('Add Repository')}</a>
+                    <a href="${h.url('new_repo')}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository')}</a>
                     %if h.HasPermissionAny('hg.admin')():
-                        <a href="${h.url('new_repos_group')}" class="btn btn-small"><i class="icon-plus"></i> ${_('Add Repository Group')}</a>
+                        <a href="${h.url('new_repos_group')}" class="btn btn-default btn-sm"><i class="icon-plus"></i> ${_('Add Repository Group')}</a>
                     %endif
                   %endif
                 %endif
                 %if c.group and h.HasRepoGroupPermissionAny('group.admin')(c.group.group_name):
-                    <a href="${h.url('edit_repo_group',group_name=c.group.group_name)}" title="${_('You have admin right to this group, and can edit it')}" class="btn btn-small"><i class="icon-pencil"></i> ${_('Edit Repository Group')}</a>
+                    <a href="${h.url('edit_repo_group',group_name=c.group.group_name)}" title="${_('You have admin right to this group, and can edit it')}" class="btn btn-default btn-sm"><i class="icon-pencil"></i> ${_('Edit Repository Group')}</a>
                 %endif
                 </li>
               </ul>
             %endif
         </div>
         <!-- end box / title -->

kallithea/templates/journal/journal.html

➞

Show inline comments

@@ @@ -5,13 +5,13 @@ @@
 </%block>
 <%def name="breadcrumbs()">
     <h5>
     <form id="filter_form">
     <input class="q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/>
     <span class="tooltip" title="${h.journal_filter_help()}">?</span>
-    <input type='submit' value="${_('Filter')}" class="btn btn-small" style="padding:0px 2px 0px 2px;margin:0px"/>
+    <input type='submit' value="${_('Filter')}" class="btn btn-default btn-sm" style="padding:0px 2px 0px 2px;margin:0px"/>
     ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)}
     </form>
     ${h.end_form()}
     </h5>
 </%def>
 <%block name="header_menu">

kallithea/templates/password_reset.html

➞

Show inline comments

@@ @@ -40,13 +40,13 @@ @@
                     </div>
                 </div>
                 %endif
                 <div class="buttons">
                     <div class="nohighlight">
                       ${h.submit('send',_('Send Password Reset Email'),class_="btn")}
+                      ${h.submit('send',_('Send Password Reset Email'),class_="btn btn-default")}
                           <div class="activation_msg">${_('A password reset link will be sent to the specified email address if it is registered in the system.')}</div>
                     </div>
                 </div>
             </div>
         </div>
         ${h.end_form()}

kallithea/templates/password_reset_confirmation.html

➞

Show inline comments

@@ @@ -50,13 +50,13 @@ @@
                     <div class="input">
                         ${h.password('password_confirm',class_='focus')}
                     </div>
                  </div>
                 <div class="buttons">
                     <div class="nohighlight">
                       ${h.submit('send',_('Confirm'),class_="btn")}
+                      ${h.submit('send',_('Confirm'),class_="btn btn-default")}
                     </div>
                 </div>
             </div>
         </div>
         ${h.end_form()}
     </div>

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -82,14 +82,14 @@ ${self.repo_context_bar('showpullrequest @@
                     <div style="clear:both"></div>
                 </div>
             </div>
             <div class="field">
                 <div class="buttons">
                     ${h.submit('save',_('Create Pull Request'),class_="btn")}
                     ${h.reset('reset',_('Reset'),class_="btn")}
                     ${h.submit('save',_('Create Pull Request'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                </div>
             </div>
         </div>
         <div style="clear:both;padding: 0 0 30px 0;"></div>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -35,13 +35,13 @@ ${self.repo_context_bar('showpullrequest @@
         <div class="field pr-not-edit" style="min-height:37px">
           <div class="label-summary">
             <label>${_('Description')}:</label>
             %if editable:
             <div style="margin: 5px">
-              <a class="btn btn-small" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>
+              <a class="btn btn-default btn-sm" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>
             </div>
             %endif
           </div>
           <div class="input">
             <div class="formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>
           </div>
@@ @@ -287,15 +287,15 @@ ${self.repo_context_bar('showpullrequest @@
         %endif
     </div>
     <div class="form" style="clear:both">
       <div class="fields">
         %if editable:
           <div class="buttons">
             ${h.submit('pr-form-save',_('Save Changes'),class_="btn btn-small")}
             ${h.submit('pr-form-clone',_('Create New Iteration with Changes'),class_="btn btn-small",disabled='disabled')}
             ${h.reset('pr-form-reset',_('Cancel Changes'),class_="btn btn-small")}
             ${h.submit('pr-form-save',_('Save Changes'),class_="btn btn-default btn-sm")}
             ${h.submit('pr-form-clone',_('Create New Iteration with Changes'),class_="btn btn-default btn-sm",disabled='disabled')}
             ${h.reset('pr-form-reset',_('Cancel Changes'),class_="btn btn-default btn-sm")}
           </div>
         %endif
       </div>
     </div>
   ${h.end_form()}
 </div>

kallithea/templates/pullrequests/pullrequest_show_all.html

➞

Show inline comments

@@ @@ -26,20 +26,20 @@ ${self.repo_context_bar('showpullrequest @@
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
              %if c.authuser.username != 'default':
               <span>
-                  <a id="open_new_pr" class="btn btn-small btn-success" href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-plus"></i> ${_('Open New Pull Request')}</a>
+                  <a id="open_new_pr" class="btn btn-success btn-sm" href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-plus"></i> ${_('Open New Pull Request')}</a>
               </span>
              %endif
               <span>
                 %if c.from_:
-                    <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-git-compare"></i> ${_('Show Pull Requests to %s') % c.repo_name}</a>
+                    <a class="btn btn-default btn-sm" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed)}"><i class="icon-git-compare"></i> ${_('Show Pull Requests to %s') % c.repo_name}</a>
                 %else:
-                    <a class="btn btn-small" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-git-compare"></i> ${_("Show Pull Requests from '%s'") % c.repo_name}</a>
+                    <a class="btn btn-default btn-sm" href="${h.url('pullrequest_show_all',repo_name=c.repo_name,closed=c.closed,from_=1)}"><i class="icon-git-compare"></i> ${_("Show Pull Requests from '%s'") % c.repo_name}</a>
                 %endif
               </span>
           </li>
         </ul>
     </div>

kallithea/templates/register.html

➞

Show inline comments

@@ @@ -84,13 +84,13 @@ @@
                     </div>
                 </div>
                 %endif
                 <div class="buttons">
                     <div class="nohighlight">
                       ${h.submit('sign_up',_('Sign Up'),class_="btn")}
+                      ${h.submit('sign_up',_('Sign Up'),class_="btn btn-default")}
                       %if c.auto_active:
                           <div class="activation_msg">${_('Registered accounts are ready to use and need no further action.')}</div>
                       %else:
                           <div class="activation_msg">${_('Please wait for an administrator to activate your account.')}</div>
                       %endif
                     </div>

kallithea/templates/summary/statistics.html

➞

Show inline comments

@@ @@ -30,13 +30,13 @@ ${self.repo_context_bar('summary')} @@
     <div class="graph">
          <div style="padding:0 10px 10px 17px;">
          %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-mini")}
+                ${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>

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -72,14 +72,14 @@ summary = lambda n:{False:'summary-short @@
                   <label>${_('Clone URL')}:</label>
                 </div>
                 <div class="input ${summary(c.show_stats)}">
                   ${self.repotag(c.db_repo)}
                   <input style="width:80%" type="text" id="clone_url" readonly="readonly" value="${c.clone_repo_url}"/>
                   <input style="display:none;width:80%" type="text" id="clone_url_id" readonly="readonly" value="${c.clone_repo_url_id}"/>
                   <div style="display:none" id="clone_by_name" class="btn btn-small">${_('Show by Name')}</div>
                   <div id="clone_by_id" class="btn btn-small">${_('Show by ID')}</div>
                   <div style="display:none" id="clone_by_name" class="btn btn-default btn-sm">${_('Show by Name')}</div>
                   <div id="clone_by_id" class="btn btn-default btn-sm">${_('Show by ID')}</div>
                 </div>
             </div>
             <div class="field">
               <div class="label-summary">
                   <label>${_('Description')}:</label>
@@ @@ -94,13 +94,13 @@ summary = lambda n:{False:'summary-short @@
               <div class="input ${summary(c.show_stats)}">
                 %if c.show_stats:
                 <div id="lang_stats"></div>
                 %else:
                    ${_('Statistics are disabled for this repository')}
                    %if h.HasPermissionAny('hg.admin')('enable stats on from summary'):
-                        ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_statistics'),class_="btn btn-mini")}
+                        ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_statistics'),class_="btn btn-default btn-xs")}
                    %endif
                 %endif
               </div>
             </div>
             <div class="field">
@@ @@ -110,17 +110,17 @@ summary = lambda n:{False:'summary-short @@
               <div class="input ${summary(c.show_stats)}">
                 %if len(c.db_repo_scm_instance.revisions) == 0:
                   ${_('There are no downloads yet')}
                 %elif not c.enable_downloads:
                   ${_('Downloads are disabled for this repository')}
                     %if h.HasPermissionAny('hg.admin')('enable downloads on from summary'):
-                        ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_downloads'),class_="btn btn-mini")}
+                        ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_downloads'),class_="btn btn-default btn-xs")}
                     %endif
                 %else:
                     <span id="${'zip_link'}">
-                        <a class="btn btn-small" 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>
+                        <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">
                       <input id="archive_subrepos" type="checkbox" name="subrepos" />
                       <label for="archive_subrepos" class="tooltip" title="${_('Check this to download archive with subrepos')}" >${_('With subrepos')}</label>
                     </span>
@@ @@ -301,13 +301,13 @@ $(document).ready(function(){ @@
+           }
+       }
     });
     var tmpl_links = {};
     %for cnt,archive in enumerate(c.db_repo_scm_instance._get_archives()):
-      tmpl_links["${archive['type']}"] = '${h.link_to('__NAME__', h.url('files_archive_home',repo_name=c.db_repo.repo_name, fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_='btn btn-small')}';
+      tmpl_links["${archive['type']}"] = '${h.link_to('__NAME__', h.url('files_archive_home',repo_name=c.db_repo.repo_name, fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_='btn btn-default btn-sm')}';
     %endfor
 });
 </script>
 %if c.show_stats:
 <script type="text/javascript">

kallithea/tests/functional/test_admin_gists.py

➞

Show inline comments

@@ @@ -70,13 +70,13 @@ class TestGistsController(TestController @@
                                          'public': 'public',
                                          '_authentication_token': self.authentication_token()},
                                  status=302)
         response = response.follow()
         response.mustcontain('added file: foo')
         response.mustcontain('gist test')
-        response.mustcontain('<div class="btn btn-mini btn-success disabled">Public Gist</div>')
+        response.mustcontain('<div class="btn btn-success btn-xs disabled">Public Gist</div>')
     def test_create_with_path_with_dirs(self):
         self.log_user()
         response = self.app.post(url('gists'),
                                  params={'lifetime': -1,
                                          'content': 'gist test',
@@ @@ -103,13 +103,13 @@ class TestGistsController(TestController @@
                                          'private': 'private',
                                          '_authentication_token': self.authentication_token()},
                                  status=302)
         response = response.follow()
         response.mustcontain('added file: private-foo<')
         response.mustcontain('private gist test')
-        response.mustcontain('<div class="btn btn-mini btn-warning disabled">Private Gist</div>')
+        response.mustcontain('<div class="btn btn-warning btn-xs disabled">Private Gist</div>')
     def test_create_with_description(self):
         self.log_user()
         response = self.app.post(url('gists'),
                                  params={'lifetime': -1,
                                          'content': 'gist test',
@@ @@ -119,13 +119,13 @@ class TestGistsController(TestController @@
                                          '_authentication_token': self.authentication_token()},
                                  status=302)
         response = response.follow()
         response.mustcontain('added file: foo-desc')
         response.mustcontain('gist test')
         response.mustcontain('gist-desc')
-        response.mustcontain('<div class="btn btn-mini btn-success disabled">Public Gist</div>')
+        response.mustcontain('<div class="btn btn-success btn-xs disabled">Public Gist</div>')
     def test_new(self):
         self.log_user()
         response = self.app.get(url('new_gist'))
     def test_delete(self):
@@ @@ -149,13 +149,13 @@ class TestGistsController(TestController @@
     def test_show(self):
         gist = _create_gist('gist-show-me')
         response = self.app.get(url('gist', gist_id=gist.gist_access_id))
         response.mustcontain('added file: gist-show-me<')
         response.mustcontain('%s - created' % TEST_USER_ADMIN_LOGIN)
         response.mustcontain('gist-desc')
-        response.mustcontain('<div class="btn btn-mini btn-success disabled">Public Gist</div>')
+        response.mustcontain('<div class="btn btn-success btn-xs disabled">Public Gist</div>')
     def test_show_as_raw(self):
         gist = _create_gist('gist-show-me', content='GIST CONTENT')
         response = self.app.get(url('formatted_gist',
                                     gist_id=gist.gist_access_id, format='raw'))
         assert response.body == 'GIST CONTENT'

kallithea/tests/functional/test_compare.py

➞

Show inline comments

@@ @@ -70,13 +70,13 @@ class TestCompareController(TestControll @@
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))
         ## files
         response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")
         #swap
-        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
+        response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
     def test_compare_forks_on_branch_extra_commits_git(self):
         self.log_user()
         repo1 = fixture.create_repo(u'one-git', repo_type='git',
                                     repo_description='diff-test',
                                     cur_user=TEST_USER_ADMIN_LOGIN)
@@ @@ -121,13 +121,13 @@ class TestCompareController(TestControll @@
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))
         ## files
         response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")
         #swap
-        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
+        response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
     def test_compare_forks_on_branch_extra_commits_origin_has_incoming_hg(self):
         self.log_user()
         repo1 = fixture.create_repo(u'one', repo_type='hg',
                                     repo_description='diff-test',
@@ @@ -180,13 +180,13 @@ class TestCompareController(TestControll @@
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))
         ## files
         response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")
         #swap
-        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
+        response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
     def test_compare_forks_on_branch_extra_commits_origin_has_incoming_git(self):
         self.log_user()
         repo1 = fixture.create_repo(u'one-git', repo_type='git',
                                     repo_description='diff-test',
@@ @@ -239,13 +239,13 @@ class TestCompareController(TestControll @@
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r1:%s</a>""" % (repo2.repo_name, cs1.raw_id, cs1.short_id))
         response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/%s">r2:%s</a>""" % (repo2.repo_name, cs2.raw_id, cs2.short_id))
         ## files
         response.mustcontain("""<a href="#C--826e8142e6ba">file1</a>""")
         #swap
-        response.mustcontain("""<a class="btn btn-small" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
+        response.mustcontain("""<a class="btn btn-default btn-sm" href="/%s/compare/branch@%s...branch@%s?other_repo=%s&amp;merge=True"><i class="icon-arrows-cw"></i> Swap</a>""" % (repo2.repo_name, rev1, rev2, repo1.repo_name))
     def test_compare_cherry_pick_changesets_from_bottom(self):
 #        repo1:
 #            cs0:
 #            cs1:

0 comments (0 inline, 0 general)