# HG changeset patch # User domruf # Date 1478541989 -3600 # Node ID 67e53a272e1a3b02b3c7e994077d3327454cccf3 # Parent d44d5bb8b454aa6b5fcb6d0bb0a7b64fb7a15d04 templates: use Bootstrap compatible 'form-control' name instead of 'medium' & co In Bootstrap, form controls tend to be 100%. diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/public/css/style.css --- a/kallithea/public/css/style.css Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/public/css/style.css Mon Nov 07 19:06:29 2016 +0100 @@ -917,19 +917,9 @@ background-color: #F5F5F5 !important; } -#content div.panel div.form div.fields div.field div.input input.small, -#content div.panel div.form div.form-horizontal div.form-group div.input input.small { - width: 30%; -} - -#content div.panel div.form div.fields div.field div.input input.medium, -#content div.panel div.form div.form-horizontal div.form-group div.input input.medium { - width: 55%; -} - -#content div.panel div.form div.fields div.field div.input input.large, -#content div.panel div.form div.form-horizontal div.form-group div.input input.large { - width: 85%; +#content div.panel div.form div.fields div.field div.input input.form-control, +#content div.panel div.form div.form-horizontal div.form-group div.input input.form-control { + width: 100%; } #content div.panel div.form div.fields div.field div.input input.date, @@ -3489,10 +3479,6 @@ padding: 0; } -#login div.form div.form-horizontal div.form-group div input.large { - width: 250px; -} - #login div.form div.form-horizontal div.form-group div.checkbox, #register div.form div.fields div.field div.checkbox, #register div.form div.form-horizontal div.form-group div.checkbox { diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/auth/auth_settings.html --- a/kallithea/templates/admin/auth/auth_settings.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/auth/auth_settings.html Mon Nov 07 19:06:29 2016 +0100 @@ -29,7 +29,7 @@
-
${h.text("auth_plugins", class_='large')} +
${h.text("auth_plugins", class_='form-control')} ${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}
${_('Available built-in plugins')}
    @@ -60,7 +60,7 @@
    - ${h.password(fullsetting,class_='small')} + ${h.password(fullsetting,class_='form-control')} ${setting["description"]}
    @@ -68,7 +68,7 @@
    - ${h.text(fullsetting,class_='small')} + ${h.text(fullsetting,class_='form-control')} ${setting["description"]}
    @@ -76,7 +76,7 @@
    -
    ${h.checkbox(fullsetting,True,class_='small')}
    +
    ${h.checkbox(fullsetting,True)}
    ${setting["description"]}
    @@ -84,7 +84,7 @@
    - ${h.select(fullsetting,setting['values'][0],setting['values'],class_='small')} + ${h.select(fullsetting,setting['values'][0],setting['values'],class_='form-control')} ${setting["description"]}
    diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/defaults/defaults.html --- a/kallithea/templates/admin/defaults/defaults.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/defaults/defaults.html Mon Nov 07 19:06:29 2016 +0100 @@ -31,7 +31,7 @@
    - ${h.select('default_repo_type','hg',c.backends,class_="medium")} + ${h.select('default_repo_type','hg',c.backends,class_='form-control')}
    diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/my_account/my_account_api_keys.html --- a/kallithea/templates/admin/my_account/my_account_api_keys.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_api_keys.html Mon Nov 07 19:06:29 2016 +0100 @@ -59,7 +59,7 @@
    - ${h.text('description', class_='medium', placeholder=_('Description'))} + ${h.text('description', class_='form-control', placeholder=_('Description'))} ${h.select('lifetime', '', c.lifetime_options)}
    diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/my_account/my_account_emails.html --- a/kallithea/templates/admin/my_account/my_account_emails.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_emails.html Mon Nov 07 19:06:29 2016 +0100 @@ -40,7 +40,7 @@
    - ${h.text('new_email', class_='medium')} + ${h.text('new_email', class_='form-control')}
    diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/my_account/my_account_password.html --- a/kallithea/templates/admin/my_account/my_account_password.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_password.html Mon Nov 07 19:06:29 2016 +0100 @@ -8,21 +8,21 @@
    - ${h.password('current_password',class_='medium')} + ${h.password('current_password',class_='form-control')}
    - ${h.password('new_password',class_='medium')} + ${h.password('new_password',class_='form-control')}
    - ${h.password('new_password_confirmation',class_='medium')} + ${h.password('new_password_confirmation',class_='form-control')}
    diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/my_account/my_account_profile.html --- a/kallithea/templates/admin/my_account/my_account_profile.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_profile.html Mon Nov 07 19:06:29 2016 +0100 @@ -20,28 +20,28 @@
    - ${h.text('username',class_='medium', readonly=c.readonly('username'))} + ${h.text('username',class_='form-control', readonly=c.readonly('username'))}
    - ${h.text('firstname',class_="medium", readonly=c.readonly('firstname'))} + ${h.text('firstname',class_='form-control', readonly=c.readonly('firstname'))}
    - ${h.text('lastname',class_="medium", readonly=c.readonly('lastname'))} + ${h.text('lastname',class_='form-control', readonly=c.readonly('lastname'))}
    - ${h.text('email',class_="medium", readonly=c.readonly('email'))} + ${h.text('email',class_='form-control', readonly=c.readonly('email'))}
    diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/permissions/permissions_ips.html --- a/kallithea/templates/admin/permissions/permissions_ips.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Mon Nov 07 19:06:29 2016 +0100 @@ -29,7 +29,7 @@
    ${h.hidden('default_user', 'True')} - ${h.text('new_ip', class_='medium')} + ${h.text('new_ip', class_='form-control')}
    diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/repo_groups/repo_group_add.html --- a/kallithea/templates/admin/repo_groups/repo_group_add.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Mon Nov 07 19:06:29 2016 +0100 @@ -31,21 +31,21 @@
    - ${h.text('group_name',class_='small')} + ${h.text('group_name',class_='form-control')}
    - ${h.textarea('group_description',cols=23,rows=5,class_="medium")} + ${h.textarea('group_description',cols=23,rows=5)}
    - ${h.select('parent_group_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")} + ${h.select('parent_group_id',request.GET.get('parent_group'),c.repo_groups,class_='form-control')}
    diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/repo_groups/repo_group_edit_settings.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Mon Nov 07 19:06:29 2016 +0100 @@ -6,21 +6,21 @@
    - ${h.text('group_name',class_='medium')} + ${h.text('group_name',class_='form-control')}
    - ${h.textarea('group_description',cols=23,rows=5,class_="medium")} + ${h.textarea('group_description',cols=23,rows=5)}
    - ${h.select('parent_group_id','',c.repo_groups,class_="medium")} + ${h.select('parent_group_id','',c.repo_groups,class_='form-control')}
    diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/repos/repo_add_base.html --- a/kallithea/templates/admin/repos/repo_add_base.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_add_base.html Mon Nov 07 19:06:29 2016 +0100 @@ -7,13 +7,13 @@
    - ${h.text('repo_name',class_="small")} + ${h.text('repo_name',class_='form-control')}
    - ${h.text('clone_uri',class_="small")} + ${h.text('clone_uri',class_='form-control')} ${_('Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL.')} @@ -29,7 +29,7 @@
    - ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")} + ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_='form-control')} ${_('Optionally select a group to put this repository into.')}
    @@ -43,14 +43,14 @@
    - ${h.select('repo_type','hg',c.backends,class_="small")} + ${h.select('repo_type','hg',c.backends,class_='form-control')} ${_('Type of repository to create.')}
    - ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")} + ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')} ${_('Default revision for files page, downloads, full text search index and readme generation')}
    diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/repos/repo_edit_advanced.html --- a/kallithea/templates/admin/repos/repo_edit_advanced.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_advanced.html Mon Nov 07 19:06:29 2016 +0100 @@ -1,7 +1,7 @@

    ${_('Parent')}

    ${h.form(url('edit_repo_advanced_fork', repo_name=c.repo_info.repo_name))}
    - ${h.select('id_fork_of','',c.repos_list,class_="medium")} + ${h.select('id_fork_of','',c.repos_list)} ${h.submit('set_as_fork_%s' % c.repo_info.repo_name,_('Set'),class_="btn btn-default btn-sm")}
      diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/repos/repo_edit_fields.html --- a/kallithea/templates/admin/repos/repo_edit_fields.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_fields.html Mon Nov 07 19:06:29 2016 +0100 @@ -31,21 +31,21 @@
      - ${h.text('new_field_key', class_='small')} + ${h.text('new_field_key', class_='form-control')}
      - ${h.text('new_field_label', class_='small', placeholder=_('Enter short label'))} + ${h.text('new_field_label', class_='form-control', placeholder=_('Enter short label'))}
      - ${h.text('new_field_desc', class_='small', placeholder=_('Enter description of a field'))} + ${h.text('new_field_desc', class_='form-control', placeholder=_('Enter description of a field'))}
      diff -r d44d5bb8b454 -r 67e53a272e1a kallithea/templates/admin/repos/repo_edit_settings.html --- a/kallithea/templates/admin/repos/repo_edit_settings.html Wed Sep 21 18:59:43 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_settings.html Mon Nov 07 19:06:29 2016 +0100 @@ -5,7 +5,7 @@
      - ${h.text('repo_name',class_="medium")} + ${h.text('repo_name',class_='form-control')} ${_('Permanent Repository ID')}: `_${c.repo_info.repo_id}` ${_('What is that?')}