# HG changeset patch # User Mads Kiilerich # Date 1477338309 -7200 # Node ID 4304595d246ca14414ae35f00ec94a3013e54b3d # Parent 5ae3fff8994ebfe276d28134fc686e1f317a07a7 style: in preparation for Bootstrap, refactor to use Bootstrap compatible form class names Based on work by Dominik Ruf. Mostly: sed -i \ -e 's,,
,g' \ -e 's,
,
,g' \ -e 's,
,
,g' \ -e 's,
+
diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/auth/auth_settings.html --- a/kallithea/templates/admin/auth/auth_settings.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/auth/auth_settings.html Mon Oct 24 21:45:09 2016 +0200 @@ -26,9 +26,9 @@ ## enabled auth plugins

${_('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')}
@@ -49,46 +49,46 @@ %for cnt, module in enumerate(c.enabled_plugins): <% pluginName = c.plugin_shortnames[module] %>

${_('Plugin')}: ${pluginName}

-
+
## autoform generation, based on plugin definition from it's settings %for setting in c.plugin_settings[module]: <% fullsetting = "auth_%s_%s" % (pluginName, setting["name"]) %> <% displayname = (setting["formname"] if ("formname" in setting) else setting["name"]) %> %if setting["type"] == "password": -
-
+
+
${h.password(fullsetting,class_='small')} ${setting["description"]}
%elif setting["type"] in ["string", "int"]: -
-
+
+
${h.text(fullsetting,class_='small')} ${setting["description"]}
%elif setting["type"] == "bool": -
-
+
+
${h.checkbox(fullsetting,True,class_='small')}
${setting["description"]}
%elif setting["type"] == "select": -
-
+
+
${h.select(fullsetting,setting['values'][0],setting['values'],class_='small')} ${setting["description"]}
%else: -
-
+
+
This field is of type ${setting['type']}, which cannot be displayed. Must be one of [string|int|bool|select].
${setting["description"]}
@@ -96,7 +96,7 @@ %endfor
%endfor -
+
${h.submit('save',_('Save'),class_="btn btn-default")}
diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/defaults/defaults.html --- a/kallithea/templates/admin/defaults/defaults.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/defaults/defaults.html Mon Oct 24 21:45:09 2016 +0200 @@ -26,20 +26,20 @@
-
+
-
+
- +
${h.select('default_repo_type','hg',c.backends,class_="medium")}
-
+
- +
${h.checkbox('default_repo_private',value="True")} @@ -48,9 +48,9 @@
-
+
- +
${h.checkbox('default_repo_enable_statistics',value="True")} @@ -58,9 +58,9 @@
-
+
- +
${h.checkbox('default_repo_enable_downloads',value="True")} @@ -68,9 +68,9 @@
-
+
- +
${h.checkbox('default_repo_enable_locking',value="True")} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/my_account/my_account_api_keys.html --- a/kallithea/templates/admin/my_account/my_account_api_keys.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_api_keys.html Mon Oct 24 21:45:09 2016 +0200 @@ -55,8 +55,8 @@ ${h.form(url('my_account_api_keys'), method='post')}
-
-
+
+
diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/my_account/my_account_emails.html --- a/kallithea/templates/admin/my_account/my_account_emails.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_emails.html Mon Oct 24 21:45:09 2016 +0200 @@ -36,10 +36,10 @@ ${h.form(url('my_account_emails'), method='post')}
-
-
+
+
- +
${h.text('new_email', class_='medium')} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/my_account/my_account_password.html --- a/kallithea/templates/admin/my_account/my_account_password.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_password.html Mon Oct 24 21:45:09 2016 +0200 @@ -4,28 +4,28 @@ ${h.form(url('my_account_password'), method='post')}
-
-
+
+
- +
${h.password('current_password',class_='medium')}
-
+
- +
${h.password('new_password',class_='medium')}
-
+
- +
${h.password('new_password_confirmation',class_='medium')} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/my_account/my_account_profile.html --- a/kallithea/templates/admin/my_account/my_account_profile.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_profile.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,7 +1,7 @@ ${h.form(url('my_account'), method='post')}
-
+
${h.gravatar_div(c.user.email)}

@@ -17,37 +17,37 @@

-
-
+
+
- +
${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 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/permissions/permissions_globals.html --- a/kallithea/templates/admin/permissions/permissions_globals.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/permissions/permissions_globals.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,10 +1,10 @@ ${h.form(url('admin_permissions'), method='post')}
-
-
+
+
- +
@@ -13,9 +13,9 @@ ${h.literal(_('Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions.' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}
-
+
- +
${h.select('default_repo_perm','',c.repo_perms_choices)} @@ -27,9 +27,9 @@ ${_('Permissions for the Default user on new repositories.')}
-
+
- +
${h.select('default_group_perm','',c.group_perms_choices)} @@ -41,9 +41,9 @@ ${_('Permissions for the Default user on new repository groups.')}
-
+
- +
${h.select('default_user_group_perm','',c.user_group_perms_choices)} @@ -55,9 +55,9 @@ ${_('Permissions for the Default user on new user groups.')}
-
+
- +
${h.select('default_repo_create','',c.repo_create_choices)} @@ -65,44 +65,44 @@ ${_('Note: This will also give all users API access to create repositories everywhere. That might change in future versions.')}
-
+
- +
${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 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/permissions/permissions_ips.html --- a/kallithea/templates/admin/permissions/permissions_ips.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Mon Oct 24 21:45:09 2016 +0200 @@ -24,10 +24,10 @@ ${h.form(url('edit_user_ips_update', id=c.user.user_id))}
-
-
+
+
- +
${h.hidden('default_user', 'True')} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/repo_groups/repo_group_add.html --- a/kallithea/templates/admin/repo_groups/repo_group_add.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Mon Oct 24 21:45:09 2016 +0200 @@ -27,28 +27,28 @@ ${h.form(url('repos_groups'))}
-
-
+
+
- +
${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")} @@ -57,7 +57,7 @@
- +
${h.checkbox('group_copy_permissions',value="True")} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/repo_groups/repo_group_edit_settings.html --- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Mon Oct 24 21:45:09 2016 +0200 @@ -2,36 +2,36 @@ ${h.form(url('update_repos_group',group_name=c.repo_group.group_name))}
-
-
+
+
- +
${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")} @@ -48,8 +48,8 @@ ${h.form(url('delete_repo_group', group_name=c.repo_group.group_name))}
-
-
+
+
${h.submit('remove_%s' % c.repo_group.group_name,_('Remove this group'),class_="btn red",onclick="return confirm('"+_('Confirm to delete this group')+"');")}
diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/repos/repo_add_base.html --- a/kallithea/templates/admin/repos/repo_add_base.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_add_base.html Mon Oct 24 21:45:09 2016 +0200 @@ -3,10 +3,10 @@ ${h.form(url('repos'))}
-
-
+
+
- +
${h.text('repo_name',class_="small")} @@ -14,7 +14,7 @@
- +
${h.text('clone_uri',class_="small")} @@ -23,18 +23,18 @@
-
+
- +
${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")} @@ -43,34 +43,34 @@
- +
${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")} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/repos/repo_edit_caches.html --- a/kallithea/templates/admin/repos/repo_edit_caches.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_caches.html Mon Oct 24 21:45:09 2016 +0200 @@ -10,7 +10,7 @@
${_('List of Cached Values')} -
${_('Username')} ${_('Action')}
+
diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/repos/repo_edit_fields.html --- a/kallithea/templates/admin/repos/repo_edit_fields.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_fields.html Mon Oct 24 21:45:09 2016 +0200 @@ -27,27 +27,27 @@ ${h.form(url('create_repo_fields', repo_name=c.repo_name))}
-
-
+
+
- +
${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 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/repos/repo_edit_permissions.html --- a/kallithea/templates/admin/repos/repo_edit_permissions.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,7 +1,7 @@ ${h.form(url('edit_repo_perms_update', repo_name=c.repo_name))}
-
-
+
+
${h.hidden('repo_private')}
${_('Prefix')} ${_('Key')}
diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/repos/repo_edit_settings.html --- a/kallithea/templates/admin/repos/repo_edit_settings.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_settings.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,10 +1,10 @@ ${h.form(url('update_repo', repo_name=c.repo_info.repo_name))}
-
-
+
+
- +
${h.text('repo_name',class_="medium")} @@ -16,9 +16,9 @@ This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service.''')}
-
+
- +
@@ -30,27 +30,27 @@
-
+
- +
${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')}
-
+
- +
@@ -60,9 +60,9 @@
-
+
- +
${h.textarea('repo_description', style="height:165px")} @@ -70,36 +70,36 @@
-
+
- +
${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")} @@ -110,9 +110,9 @@ %if c.visual.repository_fields: ## EXTRA FIELDS %for field in c.repo_fields: -
+
- +
${h.text(field.field_key_prefixed, field.field_value, class_='medium')} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/repos/repo_edit_statistics.html --- a/kallithea/templates/admin/repos/repo_edit_statistics.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_statistics.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,6 +1,6 @@ ${h.form(url('edit_repo_statistics_update', repo_name=c.repo_info.repo_name))}
-
+
  • ${_('Processed commits')}: ${c.stats_revision}/${c.repo_last_rev}
    • diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/settings/settings_email.html --- a/kallithea/templates/admin/settings/settings_email.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_email.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,10 +1,10 @@ ${h.form(url('admin_settings_email'), method='post')}
    -
    -
    +
    +
    - +
    ${h.text('test_email',size=30)} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/settings/settings_global.html --- a/kallithea/templates/admin/settings/settings_global.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_global.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,11 +1,11 @@ ${h.form(url('admin_settings_global'), method='post')}
    -
    +
    -
    +
    - +
    ${h.text('title',size=30)} @@ -13,18 +13,18 @@
    -
    +
    - +
    ${h.text('realm',size=30)}
    -
    +
    - +
    ${h.textarea('ga_code', cols=80, rows=10)} @@ -37,9 +37,9 @@
    -
    +
    - +
    ${h.text('captcha_public_key',size=60)} @@ -47,9 +47,9 @@
    -
    +
    - +
    ${h.text('captcha_private_key',size=60)} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/settings/settings_hooks.html --- a/kallithea/templates/admin/settings/settings_hooks.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_hooks.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,10 +1,10 @@

    ${_('Built-in Mercurial Hooks (Read-Only)')}

    -
    +
    % for hook in c.hooks: -
    +
    - +
    ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")} @@ -19,12 +19,12 @@

    ${_('Custom Hooks')}

    ${h.form(url('admin_settings_hooks'), method='post')}
    -
    +
    % for hook in c.custom_hooks:
    - +
    ${h.hidden('hook_ui_key',hook.ui_key)} @@ -39,7 +39,7 @@
    % endfor -
    +
    ${h.text('new_hook_ui_key',size=20)} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/settings/settings_mapping.html --- a/kallithea/templates/admin/settings/settings_mapping.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_mapping.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,9 +1,9 @@ ${h.form(url('admin_settings_mapping'), method='post')}
    -
    -
    +
    +
    - +
    diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/settings/settings_search.html --- a/kallithea/templates/admin/settings/settings_search.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_search.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,16 +1,15 @@ ${h.form(url('admin_settings_search'), method='post')}
    -
    -
    +
    +
    - +
    ${h.checkbox('full_index',True)} -
    ${_('This option completely reindexeses all of the repositories for proper fulltext search capabilities.')} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/settings/settings_vcs.html --- a/kallithea/templates/admin/settings/settings_vcs.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_vcs.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,7 +1,7 @@ ${h.form(url('admin_settings'), method='post')}
    -
    -
    +
    +
    @@ -24,7 +24,7 @@
    -
    +
    @@ -46,9 +46,9 @@
    %if c.visual.allow_repo_location_change: -
    +
    - +
    ${h.text('paths_root_path',size=60,readonly="readonly")} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/settings/settings_visual.html --- a/kallithea/templates/admin/settings/settings_visual.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_visual.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,9 +1,9 @@ ${h.form(url('admin_settings_visual'), method='post')}
    -
    +
    -
    +
    @@ -53,9 +53,9 @@
    -
    +
    - +
    ${h.text('dashboard_items',size=5)} @@ -63,9 +63,9 @@
    -
    +
    - +
    ${h.text('admin_grid_items',size=5)} @@ -73,7 +73,7 @@
    -
    +
    @@ -90,7 +90,7 @@
    -
    +
    diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/user_groups/user_group_add.html --- a/kallithea/templates/admin/user_groups/user_group_add.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_add.html Mon Oct 24 21:45:09 2016 +0200 @@ -26,27 +26,27 @@ ${h.form(url('users_groups'))}
    -
    -
    +
    +
    - +
    ${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 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/user_groups/user_group_edit_settings.html --- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,38 +1,38 @@ ${h.form(url('update_users_group', id=c.user_group.users_group_id), id='edit_users_group')}
    -
    -
    +
    +
    - +
    ${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 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/users/user_add.html --- a/kallithea/templates/admin/users/user_add.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/users/user_add.html Mon Oct 24 21:45:09 2016 +0200 @@ -26,64 +26,64 @@ ${h.form(url('new_user'))}
-
-
+
+
- +
${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 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/users/user_edit_api_keys.html --- a/kallithea/templates/admin/users/user_edit_api_keys.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_api_keys.html Mon Oct 24 21:45:09 2016 +0200 @@ -55,10 +55,10 @@ ${h.form(url('edit_user_api_keys_update', id=c.user.user_id))}
-
-
+
+
- +
${h.text('description', class_='medium', placeholder=_('Description'))} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/users/user_edit_emails.html --- a/kallithea/templates/admin/users/user_edit_emails.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_emails.html Mon Oct 24 21:45:09 2016 +0200 @@ -36,10 +36,10 @@ ${h.form(url('edit_user_emails_update', id=c.user.user_id))}
-
-
+
+
- +
${h.text('new_email', class_='medium')} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/users/user_edit_ips.html --- a/kallithea/templates/admin/users/user_edit_ips.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_ips.html Mon Oct 24 21:45:09 2016 +0200 @@ -36,10 +36,10 @@ ${h.form(url('edit_user_ips_update', id=c.user.user_id))}
-
-
+
+
- +
${h.text('new_ip', class_='medium')} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/admin/users/user_edit_profile.html --- a/kallithea/templates/admin/users/user_edit_profile.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_profile.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,6 +1,6 @@ ${h.form(url('update_user', id=c.user.user_id))}
-
+
${h.gravatar_div(c.user.email)}

@@ -17,92 +17,92 @@ %endif

-
+
-
+
- +
${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 5ae3fff8994e -r 4304595d246c kallithea/templates/base/default_perms_box.html --- a/kallithea/templates/base/default_perms_box.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/base/default_perms_box.html Mon Oct 24 21:45:09 2016 +0200 @@ -8,10 +8,10 @@ ${h.form(form_url)}
-
-
+
+
- +
${h.checkbox('inherit_default_permissions',value=True)} @@ -23,9 +23,9 @@
-
+
- +
${h.checkbox('create_repo_perm',value=True)} @@ -35,9 +35,9 @@
-
+
- +
${h.checkbox('create_user_group_perm',value=True)} @@ -47,9 +47,9 @@
-
+
- +
${h.checkbox('fork_repo_perm',value=True)} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/changelog/changelog_summary_data.html --- a/kallithea/templates/changelog/changelog_summary_data.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/changelog/changelog_summary_data.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- %if c.repo_changesets: - +
diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/forks/fork.html --- a/kallithea/templates/forks/fork.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/forks/fork.html Mon Oct 24 21:45:09 2016 +0200 @@ -20,11 +20,11 @@ ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))}
-
+
-
+
- +
${h.text('repo_name',class_="small")} @@ -33,9 +33,9 @@
-
+
- +
${h.textarea('description')} @@ -43,9 +43,9 @@
-
+
- +
${h.select('repo_group','',c.repo_groups,class_="medium")} @@ -53,9 +53,9 @@
-
+
- +
${h.select('landing_rev','',c.landing_revs,class_="medium")} @@ -63,18 +63,18 @@
-
+
- +
${h.checkbox('private',value="True")} ${_('Private repositories are only visible to people explicitly added as collaborators.')}
-
+
- +
${h.checkbox('copy_permissions',value="True", checked="checked")} @@ -82,9 +82,9 @@
%if c.can_update: -
+
- +
${h.checkbox('update_after_clone',value="True")} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/password_reset.html --- a/kallithea/templates/password_reset.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/password_reset.html Mon Oct 24 21:45:09 2016 +0200 @@ -18,11 +18,11 @@ ${h.form(url('password_reset'))}
-
+
-
+
- +
${h.text('email')} @@ -30,9 +30,9 @@
%if c.captcha_active: -
+
- +
${h.hidden('recaptcha_field')} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/password_reset_confirmation.html --- a/kallithea/templates/password_reset_confirmation.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/password_reset_confirmation.html Mon Oct 24 21:45:09 2016 +0200 @@ -24,28 +24,28 @@
-
-
+
+
- +
${h.text('token', class_='focus')}
-
+
- +
${h.password('password',class_='focus')}
-
+
- +
${h.password('password_confirm',class_='focus')} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/pullrequests/pullrequest.html --- a/kallithea/templates/pullrequests/pullrequest.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest.html Mon Oct 24 21:45:09 2016 +0200 @@ -24,29 +24,29 @@
-
+
-
+
- +
${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 @@ -83,7 +83,7 @@
-
+
${h.submit('save',_('Create Pull Request'),class_="btn btn-default")} ${h.reset('reset',_('Reset'),class_="btn btn-default")} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/pullrequests/pullrequest_data.html --- a/kallithea/templates/pullrequests/pullrequest_data.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_data.html Mon Oct 24 21:45:09 2016 +0200 @@ -8,7 +8,7 @@ %endif
-
+
diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/register.html --- a/kallithea/templates/register.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/register.html Mon Oct 24 21:45:09 2016 +0200 @@ -18,55 +18,55 @@ ${h.form(url('register'))}
-
-
+
+
- +
${h.text('username',class_="medium")}
-
+
- +
${h.password('password',class_="medium")}
-
+
- +
${h.password('password_confirmation',class_="medium")}
-
+
- +
${h.text('firstname',class_="medium")}
-
+
- +
${h.text('lastname',class_="medium")}
-
+
- +
${h.text('email',class_="medium")} @@ -74,9 +74,9 @@
%if c.captcha_active: -
+
- +
${h.hidden('recaptcha_field')} diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/search/search.html --- a/kallithea/templates/search/search.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/search/search.html Mon Oct 24 21:45:09 2016 +0200 @@ -44,10 +44,10 @@ ${h.form(h.url('search'),method='get')} %endif
-
+
- +
${h.text('q',c.cur_query,class_="small")}
@@ -57,7 +57,7 @@
${c.runtime}
-
+
diff -r 5ae3fff8994e -r 4304595d246c kallithea/templates/summary/summary.html --- a/kallithea/templates/summary/summary.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/summary/summary.html Mon Oct 24 21:45:09 2016 +0200 @@ -66,8 +66,8 @@
-
-
+
+
@@ -80,14 +80,14 @@
-
+
${h.urlify_text(c.db_repo.description, stylize=c.visual.stylify_metatags)}
-
+
@@ -103,7 +103,7 @@
-
+
${_('Vote')}