# HG changeset patch # User Mads Kiilerich # Date 1477576917 -7200 # Node ID d1923cd0521c0dc780eca02ed3ff8658d96695d5 # Parent d27572fa323c3598337d714815fd656dc114569c style: refactor form label styling to prepare for Bootstrap and get rid of wrapping with 'label' class Based on work by Dominik Ruf. diff -r d27572fa323c -r d1923cd0521c kallithea/public/css/style.css --- a/kallithea/public/css/style.css Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/public/css/style.css Thu Oct 27 16:01:57 2016 +0200 @@ -836,41 +836,25 @@ padding: 0; } -#content div.panel div.form div.fields div.field div.label, -#content div.panel div.form div.form-horizontal div.form-group div.label { - left: 70px; - width: 155px; - position: absolute; +#content div.panel div.form div.fields div.field > p, +#content div.panel div.form div.form-horizontal div.form-group > label { margin: 0; - padding: 5px 0 0 0px; -} - -#content div.panel div.form div.fields div.field div.label-summary, -#content div.panel div.form div.form-horizontal div.form-group div.label-summary { - left: 30px; +} + +#content div.panel div.form div.fields div.field > label, +#content div.panel div.form div.form-horizontal div.form-group > label { width: 155px; position: absolute; margin: 0; padding: 0px 0 0 0px; } -#content div.panel div.form div.fields div.field div.label-select, -#content div.panel div.form div.form-horizontal div.form-group div.label-select { - padding: 5px 0 0 5px; -} - -#content div.panel div.form div.fields div.field div.label label, -#content div.panel div.form div.form-horizontal div.form-group div.label label, -div.label label { +#content div.panel div.form div.fields div.field > label, +#content div.panel div.form div.form-horizontal div.form-group > label { color: #393939; font-weight: 700; } -#content div.panel div.form div.fields div.field div.label label, -#content div.panel div.form div.form-horizontal div.form-group div.label label, -div.label-summary label { - color: #393939; - font-weight: 700; -} + #content div.panel div.form div.fields div.field div.input, #content div.panel div.form div.form-horizontal div.form-group div.input { margin: 0 0 0 200px; @@ -1658,8 +1642,8 @@ padding: 5px; } -#quick_login div.form div.fields div.field div.label label, -#quick_login div.form div.form-horizontal div.form-group div.label label { +#quick_login div.form div.fields div.field > label, +#quick_login div.form div.form-horizontal div.form-group > label { color: #fff; padding-bottom: 3px; } @@ -1737,8 +1721,8 @@ padding: 20px; } -#register div.form div.fields div.field div.label, -#register div.form div.form-horizontal div.form-group div.label { +#register div.form div.fields div.field > label, +#register div.form div.form-horizontal div.form-group > label { width: 135px; float: left; text-align: right; @@ -3343,18 +3327,6 @@ padding: 0; } -#content div.panel div.form div.fields div.field div.label span, -#content div.panel div.form div.form-horizontal div.form-group div.label span, -#login div.form div.form-horizontal div.form-group div.label span, -#register div.form div.fields div.field div.label span, -#register div.form div.form-horizontal div.form-group div.label span { - height: 1%; - display: block; - color: #363636; - margin: 0; - padding: 2px 0 0; -} - #content div.panel div.form div.fields div.field div.input input.error, #content div.panel div.form div.form-horizontal div.form-group div.input input.error, #login div.form div.form-horizontal div.form-group div.input input.error, @@ -3564,8 +3536,8 @@ } #login div.form div.form-horizontal div.form-group label, -#register div.form div.fields div.field div.label label, -#register div.form div.form-horizontal div.form-group div.label label { +#register div.form div.fields div.field > label, +#register div.form div.form-horizontal div.form-group > label { color: #000; font-weight: 700; } diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/auth/auth_settings.html --- a/kallithea/templates/admin/auth/auth_settings.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/auth/auth_settings.html Thu Oct 27 16:01:57 2016 +0200 @@ -28,7 +28,7 @@

${_('Authentication Plugins')}

-
+
${h.text("auth_plugins", class_='large')} ${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}
${_('Available built-in plugins')}
@@ -58,7 +58,7 @@ <% displayname = (setting["formname"] if ("formname" in setting) else setting["name"]) %> %if setting["type"] == "password":
-
+
${h.password(fullsetting,class_='small')} ${setting["description"]} @@ -66,7 +66,7 @@
%elif setting["type"] in ["string", "int"]:
-
+
${h.text(fullsetting,class_='small')} ${setting["description"]} @@ -74,7 +74,7 @@
%elif setting["type"] == "bool":
-
+
${h.checkbox(fullsetting,True,class_='small')}
${setting["description"]} @@ -82,7 +82,7 @@
%elif setting["type"] == "select":
-
+
${h.select(fullsetting,setting['values'][0],setting['values'],class_='small')} ${setting["description"]} @@ -90,7 +90,7 @@
%else:
-
+
This field is of type ${setting['type']}, which cannot be displayed. Must be one of [string|int|bool|select].
${setting["description"]}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/defaults/defaults.html --- a/kallithea/templates/admin/defaults/defaults.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/defaults/defaults.html Thu Oct 27 16:01:57 2016 +0200 @@ -29,18 +29,14 @@
-
- -
+
${h.select('default_repo_type','hg',c.backends,class_="medium")}
-
- -
+
${h.checkbox('default_repo_private',value="True")} ${_('Private repositories are only visible to people explicitly added as collaborators.')} @@ -49,9 +45,7 @@
-
- -
+
${h.checkbox('default_repo_enable_statistics',value="True")} ${_('Enable statistics window on summary page.')} @@ -59,9 +53,7 @@
-
- -
+
${h.checkbox('default_repo_enable_downloads',value="True")} ${_('Enable download menu on summary page.')} @@ -69,9 +61,7 @@
-
- -
+
${h.checkbox('default_repo_enable_locking',value="True")} ${_('Enable lock-by-pulling on repository.')} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/my_account/my_account_api_keys.html --- a/kallithea/templates/admin/my_account/my_account_api_keys.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_api_keys.html Thu Oct 27 16:01:57 2016 +0200 @@ -57,9 +57,7 @@
-
- -
+
${h.text('description', class_='medium', placeholder=_('Description'))} ${h.select('lifetime', '', c.lifetime_options)} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/my_account/my_account_emails.html --- a/kallithea/templates/admin/my_account/my_account_emails.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_emails.html Thu Oct 27 16:01:57 2016 +0200 @@ -38,9 +38,7 @@
-
- -
+
${h.text('new_email', class_='medium')}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/my_account/my_account_password.html --- a/kallithea/templates/admin/my_account/my_account_password.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_password.html Thu Oct 27 16:01:57 2016 +0200 @@ -6,27 +6,21 @@
-
- -
+
${h.password('current_password',class_='medium')}
-
- -
+
${h.password('new_password',class_='medium')}
-
- -
+
${h.password('new_password_confirmation',class_='medium')}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/my_account/my_account_profile.html --- a/kallithea/templates/admin/my_account/my_account_profile.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_profile.html Thu Oct 27 16:01:57 2016 +0200 @@ -19,36 +19,28 @@
-
- -
+
${h.text('username',class_='medium', readonly=c.readonly('username'))}
-
- -
+
${h.text('firstname',class_="medium", readonly=c.readonly('firstname'))}
-
- -
+
${h.text('lastname',class_="medium", readonly=c.readonly('lastname'))}
-
- -
+
${h.text('email',class_="medium", readonly=c.readonly('email'))}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/permissions/permissions_globals.html --- a/kallithea/templates/admin/permissions/permissions_globals.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/permissions/permissions_globals.html Thu Oct 27 16:01:57 2016 +0200 @@ -3,9 +3,7 @@
-
- -
+
${h.checkbox('anonymous',True)} @@ -14,9 +12,7 @@
-
- -
+
${h.select('default_repo_perm','',c.repo_perms_choices)} ${h.checkbox('overwrite_default_repo','true')} @@ -28,9 +24,7 @@
-
- -
+
${h.select('default_group_perm','',c.group_perms_choices)} ${h.checkbox('overwrite_default_group','true')} @@ -42,9 +36,7 @@
-
- -
+
${h.select('default_user_group_perm','',c.user_group_perms_choices)} ${h.checkbox('overwrite_default_user_group','true')} @@ -56,9 +48,7 @@
-
- -
+
${h.select('default_repo_create','',c.repo_create_choices)} ${_('Enable this to allow non-admins to create repositories at the top level.')} @@ -66,44 +56,34 @@
-
- -
+
${h.select('create_on_write','',c.repo_create_on_write_choices)} ${_('With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing.')}
-
- -
+
${h.select('default_user_group_create','',c.user_group_create_choices)} ${_('Enable this to allow non-admins to create user groups.')}
-
- -
+
${h.select('default_fork','',c.fork_choices)} ${_('Enable this to allow non-admins to fork repositories.')}
-
- -
+
${h.select('default_register','',c.register_choices)}
-
- -
+
${h.select('default_extern_activate','',c.extern_activate_choices)}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/permissions/permissions_ips.html --- a/kallithea/templates/admin/permissions/permissions_ips.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Thu Oct 27 16:01:57 2016 +0200 @@ -26,9 +26,7 @@
-
- -
+
${h.hidden('default_user', 'True')} ${h.text('new_ip', class_='medium')} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/repo_groups/repo_group_add.html --- a/kallithea/templates/admin/repo_groups/repo_group_add.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Thu Oct 27 16:01:57 2016 +0200 @@ -29,36 +29,28 @@
-
- -
+
${h.text('group_name',class_='small')}
-
- -
+
${h.textarea('group_description',cols=23,rows=5,class_="medium")}
-
- -
+
${h.select('group_parent_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
-
- -
+
${h.checkbox('group_copy_permissions',value="True")} ${_('Copy permission set from parent repository group.')} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/repo_groups/repo_group_edit_settings.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Thu Oct 27 16:01:57 2016 +0200 @@ -4,36 +4,28 @@
-
- -
+
${h.text('group_name',class_='medium')}
-
- -
+
${h.textarea('group_description',cols=23,rows=5,class_="medium")}
-
- -
+
${h.select('group_parent_id','',c.repo_groups,class_="medium")}
-
- -
+
${h.checkbox('enable_locking',value="True")} ${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/repos/repo_add_base.html --- a/kallithea/templates/admin/repos/repo_add_base.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_add_base.html Thu Oct 27 16:01:57 2016 +0200 @@ -5,17 +5,13 @@
-
- -
+
${h.text('repo_name',class_="small")}
-
- -
+
${h.text('clone_uri',class_="small")} @@ -24,54 +20,42 @@
-
- -
+
${h.textarea('repo_description')} ${_('Keep it short and to the point. Use a README file for longer descriptions.')}
-
- -
+
${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")} ${_('Optionally select a group to put this repository into.')}
-
- -
+
${h.checkbox('repo_copy_permissions',value="True")} ${_('Copy permission set from parent repository group.')}
-
- -
+
${h.select('repo_type','hg',c.backends,class_="small")} ${_('Type of repository to create.')}
-
- -
+
${h.select('repo_landing_rev','',c.landing_revs,class_="medium")} ${_('Default revision for files page, downloads, full text search index and readme generation')}
-
- -
+
${h.checkbox('repo_private',value="True")} ${_('Private repositories are only visible to people explicitly added as collaborators.')} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/repos/repo_edit_fields.html --- a/kallithea/templates/admin/repos/repo_edit_fields.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_fields.html Thu Oct 27 16:01:57 2016 +0200 @@ -29,26 +29,20 @@
-
- -
+
${h.text('new_field_key', class_='small')}
-
- -
+
${h.text('new_field_label', class_='small', placeholder=_('Enter short label'))}
-
- -
+
${h.text('new_field_desc', class_='small', placeholder=_('Enter description of a field'))}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/repos/repo_edit_settings.html --- a/kallithea/templates/admin/repos/repo_edit_settings.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_settings.html Thu Oct 27 16:01:57 2016 +0200 @@ -3,9 +3,7 @@
-
- -
+
${h.text('repo_name',class_="medium")} ${_('Permanent Repository ID')}: `_${c.repo_info.repo_id}` ${_('What is that?')} @@ -17,9 +15,7 @@
-
- -
+
${h.text('clone_uri',class_="medium", placeholder=_('Repository URL'))} @@ -31,27 +27,21 @@
-
- -
+
${h.select('repo_group','',c.repo_groups,class_="medium")} ${_('Optionally select a group to put this repository into.')}
-
- -
+
${h.select('repo_landing_rev','',c.landing_revs,class_="medium")} ${_('Default revision for files page, downloads, whoosh and readme')}
-
- -
+
${h.text('owner',class_='yui-ac-input')} @@ -61,9 +51,7 @@
-
- -
+
${h.textarea('repo_description', style="height:165px")} ${_('Keep it short and to the point. Use a README file for longer descriptions.')} @@ -71,36 +59,28 @@
-
- -
+
${h.checkbox('repo_private',value="True")} ${_('Private repositories are only visible to people explicitly added as collaborators.')}
-
- -
+
${h.checkbox('repo_enable_statistics',value="True")} ${_('Enable statistics window on summary page.')}
-
- -
+
${h.checkbox('repo_enable_downloads',value="True")} ${_('Enable download menu on summary page.')}
-
- -
+
${h.checkbox('repo_enable_locking',value="True")} ${_('Enable lock-by-pulling on repository.')} @@ -111,9 +91,7 @@ ## EXTRA FIELDS %for field in c.repo_fields:
-
- -
+
${h.text(field.field_key_prefixed, field.field_value, class_='medium')} %if field.field_desc: diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/settings/settings_email.html --- a/kallithea/templates/admin/settings/settings_email.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_email.html Thu Oct 27 16:01:57 2016 +0200 @@ -3,9 +3,7 @@
-
- -
+
${h.text('test_email',size=30)}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/settings/settings_global.html --- a/kallithea/templates/admin/settings/settings_global.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_global.html Thu Oct 27 16:01:57 2016 +0200 @@ -4,9 +4,7 @@
-
- -
+
${h.text('title',size=30)} ${_('Set a custom title for your Kallithea Service.')} @@ -14,18 +12,14 @@
-
- -
+
${h.text('realm',size=30)}
-
- -
+
${h.textarea('ga_code', cols=80, rows=10)} ${_('HTML (possibly with \ @@ -38,9 +32,7 @@
-
- -
+
${h.text('captcha_public_key',size=60)} ${_('Public key for reCaptcha system.')} @@ -48,9 +40,7 @@
-
- -
+
${h.text('captcha_private_key',size=60)} ${_('Private key for reCaptcha system. Setting this value will enable captcha on registration.')} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/settings/settings_hooks.html --- a/kallithea/templates/admin/settings/settings_hooks.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_hooks.html Thu Oct 27 16:01:57 2016 +0200 @@ -3,9 +3,7 @@
% for hook in c.hooks:
-
- -
+
${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")}
@@ -23,9 +21,7 @@ % for hook in c.custom_hooks:
-
- -
+
${h.hidden('hook_ui_key',hook.ui_key)} ${h.hidden('hook_ui_value',hook.ui_value)} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/settings/settings_mapping.html --- a/kallithea/templates/admin/settings/settings_mapping.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_mapping.html Thu Oct 27 16:01:57 2016 +0200 @@ -2,9 +2,7 @@
-
- -
+
${h.checkbox('destroy',True)} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/settings/settings_search.html --- a/kallithea/templates/admin/settings/settings_search.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_search.html Thu Oct 27 16:01:57 2016 +0200 @@ -3,9 +3,7 @@
-
- -
+
${h.checkbox('full_index',True)} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/settings/settings_vcs.html --- a/kallithea/templates/admin/settings/settings_vcs.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_vcs.html Thu Oct 27 16:01:57 2016 +0200 @@ -2,9 +2,7 @@
-
- -
+
${h.checkbox('hooks_changegroup_repo_size','True')} @@ -25,9 +23,7 @@
-
- -
+
${h.checkbox('extensions_largefiles','True')} @@ -47,9 +43,7 @@
%if c.visual.allow_repo_location_change:
-
- -
+
${h.text('paths_root_path',size=60,readonly="readonly")}
-
- -
+
${h.checkbox('repository_fields','True')} @@ -36,9 +34,7 @@ {netloc} network location/server host of running Kallithea server''')}
-
- -
+
${h.text('clone_uri_tmpl', size=80)} @@ -54,9 +50,7 @@
-
- -
+
${h.text('dashboard_items',size=5)} ${_('Number of items displayed in the main page dashboard before pagination is shown.')} @@ -64,9 +58,7 @@
-
- -
+
${h.text('admin_grid_items',size=5)} ${_('Number of items displayed in the admin pages grids before pagination is shown.')} @@ -74,9 +66,7 @@
-
- -
+
${h.checkbox('show_public_icon','True')} @@ -91,9 +81,7 @@
-
- -
+
${h.checkbox('stylify_metatags','True')} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/user_groups/user_group_add.html --- a/kallithea/templates/admin/user_groups/user_group_add.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_add.html Thu Oct 27 16:01:57 2016 +0200 @@ -28,26 +28,20 @@
-
- -
+
${h.text('users_group_name',class_='small')}
-
- -
+
${h.textarea('user_group_description')} ${_('Short, optional description for this user group.')}
-
- -
+
${h.checkbox('users_group_active',value=True, checked='checked')}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/user_groups/user_group_edit_settings.html --- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html Thu Oct 27 16:01:57 2016 +0200 @@ -3,34 +3,26 @@
-
- -
+
${h.text('users_group_name',class_='large')}
-
- -
+
${h.textarea('user_group_description')} ${_('Short, optional description for this user group.')}
-
- -
+
${h.checkbox('users_group_active',value=True)}
-
- -
+
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/users/user_add.html --- a/kallithea/templates/admin/users/user_add.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/users/user_add.html Thu Oct 27 16:01:57 2016 +0200 @@ -28,63 +28,49 @@
-
- -
+
${h.text('username',class_='small')}
-
- -
+
${h.password('password',class_='small')}
-
- -
+
${h.password('password_confirmation',class_="small")}
-
- -
+
${h.text('firstname',class_='small')}
-
- -
+
${h.text('lastname',class_='small')}
-
- -
+
${h.text('email',class_='small')}
-
- -
+
${h.checkbox('active',value=True,checked='checked')}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/users/user_edit_api_keys.html --- a/kallithea/templates/admin/users/user_edit_api_keys.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_api_keys.html Thu Oct 27 16:01:57 2016 +0200 @@ -57,9 +57,7 @@
-
- -
+
${h.text('description', class_='medium', placeholder=_('Description'))} ${h.select('lifetime', '', c.lifetime_options)} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/users/user_edit_emails.html --- a/kallithea/templates/admin/users/user_edit_emails.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_emails.html Thu Oct 27 16:01:57 2016 +0200 @@ -38,9 +38,7 @@
-
- -
+
${h.text('new_email', class_='medium')}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/users/user_edit_ips.html --- a/kallithea/templates/admin/users/user_edit_ips.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_ips.html Thu Oct 27 16:01:57 2016 +0200 @@ -38,9 +38,7 @@
-
- -
+
${h.text('new_ip', class_='medium')}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/admin/users/user_edit_profile.html --- a/kallithea/templates/admin/users/user_edit_profile.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_profile.html Thu Oct 27 16:01:57 2016 +0200 @@ -20,90 +20,70 @@
-
- -
+
${h.text('username',class_='medium', readonly=c.readonly('username'))}
-
- -
+
${h.text('email',class_='medium', readonly=c.readonly('email'))}
-
- -
+
${h.text('extern_type',class_='medium',readonly="readonly")}
-
- -
+
${h.text('extern_name',class_='medium',readonly="readonly")}
-
- -
+
${h.password('new_password',class_='medium',readonly=c.readonly('password'))}
-
- -
+
${h.password('password_confirmation',class_="medium",readonly=c.readonly('password'))}
-
- -
+
${h.text('firstname',class_='medium', readonly=c.readonly('firstname'))}
-
- -
+
${h.text('lastname',class_='medium', readonly=c.readonly('lastname'))}
-
- -
+
${h.checkbox('active',value=True, readonly=c.readonly('active'))}
-
- -
+
${h.checkbox('admin',value=True, readonly=c.readonly('admin'))}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/base/base.html --- a/kallithea/templates/base/base.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/base/base.html Thu Oct 27 16:01:57 2016 +0200 @@ -384,18 +384,14 @@
-
- -
+
${h.text('username',class_='focus')}
-
- -
+
${h.password('password',class_='focus')}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/base/default_perms_box.html --- a/kallithea/templates/base/default_perms_box.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/base/default_perms_box.html Thu Oct 27 16:01:57 2016 +0200 @@ -10,9 +10,7 @@
-
- -
+
${h.checkbox('inherit_default_permissions',value=True)} @@ -24,9 +22,7 @@
-
- -
+
${h.checkbox('create_repo_perm',value=True)} @@ -36,9 +32,7 @@
-
- -
+
${h.checkbox('create_user_group_perm',value=True)} @@ -48,9 +42,7 @@
-
- -
+
${h.checkbox('fork_repo_perm',value=True)} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/forks/fork.html --- a/kallithea/templates/forks/fork.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/forks/fork.html Thu Oct 27 16:01:57 2016 +0200 @@ -23,9 +23,7 @@
-
- -
+
${h.text('repo_name',class_="small")} ${h.hidden('repo_type',c.repo_info.repo_type)} @@ -34,9 +32,7 @@
-
- -
+
${h.textarea('description')} ${_('Keep it short and to the point. Use a README file for longer descriptions.')} @@ -44,9 +40,7 @@
-
- -
+
${h.select('repo_group','',c.repo_groups,class_="medium")} ${_('Optionally select a group to put this repository into.')} @@ -54,9 +48,7 @@
-
- -
+
${h.select('landing_rev','',c.landing_revs,class_="medium")} ${_('Default revision for files page, downloads, whoosh, and readme.')} @@ -64,9 +56,7 @@
-
- -
+
${h.checkbox('private',value="True")} ${_('Private repositories are only visible to people explicitly added as collaborators.')} @@ -74,9 +64,7 @@
-
- -
+
${h.checkbox('copy_permissions',value="True", checked="checked")} ${_('Copy permissions from forked repository')} @@ -85,9 +73,7 @@ %if c.can_update:
-
- -
+
${h.checkbox('update_after_clone',value="True")} ${_('Checkout source after making a clone')} diff -r d27572fa323c -r d1923cd0521c kallithea/templates/password_reset.html --- a/kallithea/templates/password_reset.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/password_reset.html Thu Oct 27 16:01:57 2016 +0200 @@ -21,9 +21,7 @@
-
- -
+
${h.text('email')}
@@ -31,9 +29,7 @@ %if c.captcha_active:
-
- -
+
${h.hidden('recaptcha_field')}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/password_reset_confirmation.html --- a/kallithea/templates/password_reset_confirmation.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/password_reset_confirmation.html Thu Oct 27 16:01:57 2016 +0200 @@ -26,27 +26,21 @@
-
- -
+
${h.text('token', class_='focus')}
-
- -
+
${h.password('password',class_='focus')}
-
- -
+
${h.password('password_confirm',class_='focus')}
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/pullrequests/pullrequest.html --- a/kallithea/templates/pullrequests/pullrequest.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest.html Thu Oct 27 16:01:57 2016 +0200 @@ -27,27 +27,21 @@
-
- -
+
${h.text('pullrequest_title',class_="large",placeholder=_('Summarize the changes - or leave empty'))}
-
- -
+
${h.textarea('pullrequest_desc',size=30,placeholder=_('Write a short description on this pull request'))}
-
- -
+
##ORG
diff -r d27572fa323c -r d1923cd0521c kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Thu Oct 27 16:01:57 2016 +0200 @@ -34,14 +34,12 @@
-
%if editable: -
+ %endif -
${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}
@@ -50,18 +48,14 @@ %if editable: