Mercurial > kallithea
changeset 6284:d1923cd0521c
style: refactor form label styling to prepare for Bootstrap and get rid of wrapping with 'label' class
Based on work by Dominik Ruf.
line wrap: on
line diff
--- 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; }
--- 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 @@ <h1>${_('Authentication Plugins')}</h1> <div class="form-horizontal"> <div class="form-group"> - <div class="label"><label class="control-label" for="auth_plugins">${_("Enabled Plugins")}</label></div> + <label class="control-label" for="auth_plugins">${_("Enabled Plugins")}</label> <div class="input">${h.text("auth_plugins", class_='large')} <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> @@ -58,7 +58,7 @@ <% displayname = (setting["formname"] if ("formname" in setting) else setting["name"]) %> %if setting["type"] == "password": <div class="form-group"> - <div class="label"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div> + <label class="control-label" for="${fullsetting}">${_(displayname)}</label> <div class="input"> ${h.password(fullsetting,class_='small')} <span class="help-block">${setting["description"]}</span> @@ -66,7 +66,7 @@ </div> %elif setting["type"] in ["string", "int"]: <div class="form-group"> - <div class="label"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div> + <label class="control-label" for="${fullsetting}">${_(displayname)}</label> <div class="input"> ${h.text(fullsetting,class_='small')} <span class="help-block">${setting["description"]}</span> @@ -74,7 +74,7 @@ </div> %elif setting["type"] == "bool": <div class="form-group"> - <div class="label label-checkbox"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div> + <label class="control-label" for="${fullsetting}">${_(displayname)}</label> <div class="checkboxes"> <div class="checkbox">${h.checkbox(fullsetting,True,class_='small')}</div> <span class="help-block">${setting["description"]}</span> @@ -82,7 +82,7 @@ </div> %elif setting["type"] == "select": <div class="form-group"> - <div class="label"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div> + <label class="control-label" for="${fullsetting}">${_(displayname)}</label> <div class="select"> ${h.select(fullsetting,setting['values'][0],setting['values'],class_='small')} <span class="help-block">${setting["description"]}</span> @@ -90,7 +90,7 @@ </div> %else: <div class="form-group"> - <div class="label"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div> + <label class="control-label" for="${fullsetting}">${_(displayname)}</label> <div class="input">This field is of type ${setting['type']}, which cannot be displayed. Must be one of [string|int|bool|select].</div> <span class="help-block">${setting["description"]}</span> </div>
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="default_repo_type">${_('Type')}:</label> - </div> + <label class="control-label" for="default_repo_type">${_('Type')}:</label> <div class="input"> ${h.select('default_repo_type','hg',c.backends,class_="medium")} </div> </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="default_repo_private">${_('Private repository')}:</label> - </div> + <label class="control-label" for="default_repo_private">${_('Private repository')}:</label> <div class="checkboxes"> ${h.checkbox('default_repo_private',value="True")} <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span> @@ -49,9 +45,7 @@ <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="default_repo_enable_statistics">${_('Enable statistics')}:</label> - </div> + <label class="control-label" for="default_repo_enable_statistics">${_('Enable statistics')}:</label> <div class="checkboxes"> ${h.checkbox('default_repo_enable_statistics',value="True")} <span class="help-block">${_('Enable statistics window on summary page.')}</span> @@ -59,9 +53,7 @@ </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="default_repo_enable_downloads">${_('Enable downloads')}:</label> - </div> + <label class="control-label" for="default_repo_enable_downloads">${_('Enable downloads')}:</label> <div class="checkboxes"> ${h.checkbox('default_repo_enable_downloads',value="True")} <span class="help-block">${_('Enable download menu on summary page.')}</span> @@ -69,9 +61,7 @@ </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="default_repo_enable_locking">${_('Enable locking')}:</label> - </div> + <label class="control-label" for="default_repo_enable_locking">${_('Enable locking')}:</label> <div class="checkboxes"> ${h.checkbox('default_repo_enable_locking',value="True")} <span class="help-block">${_('Enable lock-by-pulling on repository.')}</span>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label for="description">${_('New API key')}:</label> - </div> + <label for="description">${_('New API key')}:</label> <div class="input"> ${h.text('description', class_='medium', placeholder=_('Description'))} ${h.select('lifetime', '', c.lifetime_options)}
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="new_email">${_('New email address')}:</label> - </div> + <label class="control-label" for="new_email">${_('New email address')}:</label> <div class="input"> ${h.text('new_email', class_='medium')} </div>
--- 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 @@ <div class="form"> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="current_password">${_('Current password')}:</label> - </div> + <label class="control-label" for="current_password">${_('Current password')}:</label> <div class="input"> ${h.password('current_password',class_='medium')} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="new_password">${_('New password')}:</label> - </div> + <label class="control-label" for="new_password">${_('New password')}:</label> <div class="input"> ${h.password('new_password',class_='medium')} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="new_password_confirmation">${_('Confirm new password')}:</label> - </div> + <label class="control-label" for="new_password_confirmation">${_('Confirm new password')}:</label> <div class="input"> ${h.password('new_password_confirmation',class_='medium')} </div>
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="username">${_('Username')}:</label> - </div> + <label class="control-label" for="username">${_('Username')}:</label> <div class="input"> ${h.text('username',class_='medium', readonly=c.readonly('username'))} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="name">${_('First Name')}:</label> - </div> + <label class="control-label" for="name">${_('First Name')}:</label> <div class="input"> ${h.text('firstname',class_="medium", readonly=c.readonly('firstname'))} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="lastname">${_('Last Name')}:</label> - </div> + <label class="control-label" for="lastname">${_('Last Name')}:</label> <div class="input"> ${h.text('lastname',class_="medium", readonly=c.readonly('lastname'))} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="email">${_('Email')}:</label> - </div> + <label class="control-label" for="email">${_('Email')}:</label> <div class="input"> ${h.text('email',class_="medium", readonly=c.readonly('email'))} </div>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="anonymous">${_('Anonymous access')}:</label> - </div> + <label class="control-label" for="anonymous">${_('Anonymous access')}:</label> <div class="checkboxes"> <div class="checkbox"> ${h.checkbox('anonymous',True)} @@ -14,9 +12,7 @@ </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="default_repo_perm">${_('Repository')}:</label> - </div> + <label class="control-label" for="default_repo_perm">${_('Repository')}:</label> <div class="select"> ${h.select('default_repo_perm','',c.repo_perms_choices)} ${h.checkbox('overwrite_default_repo','true')} @@ -28,9 +24,7 @@ </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="default_group_perm">${_('Repository group')}:</label> - </div> + <label class="control-label" for="default_group_perm">${_('Repository group')}:</label> <div class="select"> ${h.select('default_group_perm','',c.group_perms_choices)} ${h.checkbox('overwrite_default_group','true')} @@ -42,9 +36,7 @@ </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="default_group_perm">${_('User group')}:</label> - </div> + <label class="control-label" for="default_group_perm">${_('User group')}:</label> <div class="select"> ${h.select('default_user_group_perm','',c.user_group_perms_choices)} ${h.checkbox('overwrite_default_user_group','true')} @@ -56,9 +48,7 @@ </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="default_repo_create">${_('Top level repository creation')}:</label> - </div> + <label class="control-label" for="default_repo_create">${_('Top level repository creation')}:</label> <div class="select"> ${h.select('default_repo_create','',c.repo_create_choices)} <span class="help-block">${_('Enable this to allow non-admins to create repositories at the top level.')}</span> @@ -66,44 +56,34 @@ </div> </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="create_on_write">${_('Repository creation with group write access')}:</label> - </div> + <label class="control-label" for="create_on_write">${_('Repository creation with group write access')}:</label> <div class="select"> ${h.select('create_on_write','',c.repo_create_on_write_choices)} <span class="help-block">${_('With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing.')}</span> </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="default_user_group_create">${_('User group creation')}:</label> - </div> + <label class="control-label" for="default_user_group_create">${_('User group creation')}:</label> <div class="select"> ${h.select('default_user_group_create','',c.user_group_create_choices)} <span class="help-block">${_('Enable this to allow non-admins to create user groups.')}</span> </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="default_fork">${_('Repository forking')}:</label> - </div> + <label class="control-label" for="default_fork">${_('Repository forking')}:</label> <div class="select"> ${h.select('default_fork','',c.fork_choices)} <span class="help-block">${_('Enable this to allow non-admins to fork repositories.')}</span> </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="default_register">${_('Registration')}:</label> - </div> + <label class="control-label" for="default_register">${_('Registration')}:</label> <div class="select"> ${h.select('default_register','',c.register_choices)} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="default_extern_activate">${_('External auth account activation')}:</label> - </div> + <label class="control-label" for="default_extern_activate">${_('External auth account activation')}:</label> <div class="select"> ${h.select('default_extern_activate','',c.extern_activate_choices)} </div>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="new_ip">${_('New IP address')}:</label> - </div> + <label class="control-label" for="new_ip">${_('New IP address')}:</label> <div class="input"> ${h.hidden('default_user', 'True')} ${h.text('new_ip', class_='medium')}
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="group_name">${_('Group name')}:</label> - </div> + <label class="control-label" for="group_name">${_('Group name')}:</label> <div class="input"> ${h.text('group_name',class_='small')} </div> </div> <div class="form-group"> - <div class="label label-textarea"> - <label class="control-label" for="group_description">${_('Description')}:</label> - </div> + <label class="control-label" for="group_description">${_('Description')}:</label> <div class="textarea-repo editor"> ${h.textarea('group_description',cols=23,rows=5,class_="medium")} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="group_parent_id">${_('Group parent')}:</label> - </div> + <label class="control-label" for="group_parent_id">${_('Group parent')}:</label> <div class="input"> ${h.select('group_parent_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")} </div> </div> <div id="copy_perms" class="field"> - <div class="label label-checkbox"> - <label class="control-label" for="group_copy_permissions">${_('Copy parent group permissions')}:</label> - </div> + <label class="control-label" for="group_copy_permissions">${_('Copy parent group permissions')}:</label> <div class="checkboxes"> ${h.checkbox('group_copy_permissions',value="True")} <span class="help-block">${_('Copy permission set from parent repository group.')}</span>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="group_name">${_('Group name')}:</label> - </div> + <label class="control-label" for="group_name">${_('Group name')}:</label> <div class="input"> ${h.text('group_name',class_='medium')} </div> </div> <div class="form-group"> - <div class="label label-textarea"> - <label class="control-label" for="group_description">${_('Description')}:</label> - </div> + <label class="control-label" for="group_description">${_('Description')}:</label> <div class="textarea text-area editor"> ${h.textarea('group_description',cols=23,rows=5,class_="medium")} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="group_parent_id">${_('Group parent')}:</label> - </div> + <label class="control-label" for="group_parent_id">${_('Group parent')}:</label> <div class="input"> ${h.select('group_parent_id','',c.repo_groups,class_="medium")} </div> </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="enable_locking">${_('Enable locking')}:</label> - </div> + <label class="control-label" for="enable_locking">${_('Enable locking')}:</label> <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>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="repo_name">${_('Name')}:</label> - </div> + <label class="control-label" for="repo_name">${_('Name')}:</label> <div class="input"> ${h.text('repo_name',class_="small")} </div> </div> <div id="remote_clone" class="field"> - <div class="label"> - <label class="control-label" for="clone_uri">${_('Clone remote repository')}:</label> - </div> + <label class="control-label" for="clone_uri">${_('Clone remote repository')}:</label> <div class="input"> ${h.text('clone_uri',class_="small")} <span class="help-block"> @@ -24,54 +20,42 @@ </div> </div> <div class="form-group"> - <div class="label label-textarea"> - <label class="control-label" for="repo_description">${_('Description')}:</label> - </div> + <label class="control-label" for="repo_description">${_('Description')}:</label> <div class="textarea-repo editor"> ${h.textarea('repo_description')} <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span> </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="repo_group">${_('Repository group')}:</label> - </div> + <label class="control-label" for="repo_group">${_('Repository group')}:</label> <div class="input"> ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")} <span class="help-block">${_('Optionally select a group to put this repository into.')}</span> </div> </div> <div id="copy_perms" class="field"> - <div class="label label-checkbox"> - <label class="control-label" for="repo_copy_permissions">${_('Copy parent group permissions')}:</label> - </div> + <label class="control-label" for="repo_copy_permissions">${_('Copy parent group permissions')}:</label> <div class="checkboxes"> ${h.checkbox('repo_copy_permissions',value="True")} <span class="help-block">${_('Copy permission set from parent repository group.')}</span> </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="repo_type">${_('Type')}:</label> - </div> + <label class="control-label" for="repo_type">${_('Type')}:</label> <div class="input"> ${h.select('repo_type','hg',c.backends,class_="small")} <span class="help-block">${_('Type of repository to create.')}</span> </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label> - </div> + <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label> <div class="input"> ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")} <span class="help-block">${_('Default revision for files page, downloads, full text search index and readme generation')}</span> </div> </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="repo_private">${_('Private repository')}:</label> - </div> + <label class="control-label" for="repo_private">${_('Private repository')}:</label> <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>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="new_field_key">${_('New field key')}:</label> - </div> + <label class="control-label" for="new_field_key">${_('New field key')}:</label> <div class="input"> ${h.text('new_field_key', class_='small')} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="new_field_label">${_('New field label')}:</label> - </div> + <label class="control-label" for="new_field_label">${_('New field label')}:</label> <div class="input"> ${h.text('new_field_label', class_='small', placeholder=_('Enter short label'))} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="new_field_desc">${_('New field description')}:</label> - </div> + <label class="control-label" for="new_field_desc">${_('New field description')}:</label> <div class="input"> ${h.text('new_field_desc', class_='small', placeholder=_('Enter description of a field'))} </div>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="repo_name">${_('Name')}:</label> - </div> + <label class="control-label" for="repo_name">${_('Name')}:</label> <div class="input"> ${h.text('repo_name',class_="medium")} <span class="help-block">${_('Permanent Repository ID')}: `_${c.repo_info.repo_id}` <span><a id="show_more_clone_id" href="#">${_('What is that?')}</a></span></span> @@ -17,9 +15,7 @@ </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="clone_uri">${_('Remote repository')}:</label> - </div> + <label class="control-label" for="clone_uri">${_('Remote repository')}:</label> <div class="input"> <div id="alter_clone_uri"> ${h.text('clone_uri',class_="medium", placeholder=_('Repository URL'))} @@ -31,27 +27,21 @@ </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="repo_group">${_('Repository group')}:</label> - </div> + <label class="control-label" for="repo_group">${_('Repository group')}:</label> <div class="input"> ${h.select('repo_group','',c.repo_groups,class_="medium")} <span class="help-block">${_('Optionally select a group to put this repository into.')}</span> </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label> - </div> + <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label> <div class="input"> ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")} <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span> </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="owner">${_('Owner')}:</label> - </div> + <label class="control-label" for="owner">${_('Owner')}:</label> <div class="input input-medium ac"> <div class="perm_ac"> ${h.text('owner',class_='yui-ac-input')} @@ -61,9 +51,7 @@ </div> </div> <div class="form-group"> - <div class="label label-textarea"> - <label class="control-label" for="repo_description">${_('Description')}:</label> - </div> + <label class="control-label" for="repo_description">${_('Description')}:</label> <div class="textarea text-area editor"> ${h.textarea('repo_description', style="height:165px")} <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span> @@ -71,36 +59,28 @@ </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="repo_private">${_('Private repository')}:</label> - </div> + <label class="control-label" for="repo_private">${_('Private repository')}:</label> <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="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="repo_enable_statistics">${_('Enable statistics')}:</label> - </div> + <label class="control-label" for="repo_enable_statistics">${_('Enable statistics')}:</label> <div class="checkboxes"> ${h.checkbox('repo_enable_statistics',value="True")} <span class="help-block">${_('Enable statistics window on summary page.')}</span> </div> </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="repo_enable_downloads">${_('Enable downloads')}:</label> - </div> + <label class="control-label" for="repo_enable_downloads">${_('Enable downloads')}:</label> <div class="checkboxes"> ${h.checkbox('repo_enable_downloads',value="True")} <span class="help-block">${_('Enable download menu on summary page.')}</span> </div> </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="repo_enable_locking">${_('Enable locking')}:</label> - </div> + <label class="control-label" for="repo_enable_locking">${_('Enable locking')}:</label> <div class="checkboxes"> ${h.checkbox('repo_enable_locking',value="True")} <span class="help-block">${_('Enable lock-by-pulling on repository.')}</span> @@ -111,9 +91,7 @@ ## EXTRA FIELDS %for field in c.repo_fields: <div class="form-group"> - <div class="label"> - <label class="control-label" for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label> - </div> + <label class="control-label" for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label> <div class="input input-medium"> ${h.text(field.field_key_prefixed, field.field_value, class_='medium')} %if field.field_desc:
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="test_email">${_('Send test email to')}:</label> - </div> + <label class="control-label" for="test_email">${_('Send test email to')}:</label> <div class="input"> ${h.text('test_email',size=30)} </div>
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="title">${_('Site branding')}:</label> - </div> + <label class="control-label" for="title">${_('Site branding')}:</label> <div class="input"> ${h.text('title',size=30)} <span class="help-block">${_('Set a custom title for your Kallithea Service.')}</span> @@ -14,18 +12,14 @@ </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="realm">${_('HTTP authentication realm')}:</label> - </div> + <label class="control-label" for="realm">${_('HTTP authentication realm')}:</label> <div class="input"> ${h.text('realm',size=30)} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="ga_code">${_('HTML/JavaScript/CSS customization block')}:</label> - </div> + <label class="control-label" for="ga_code">${_('HTML/JavaScript/CSS customization block')}:</label> <div class="input"> ${h.textarea('ga_code', cols=80, rows=10)} <span class="help-block">${_('HTML (possibly with \ @@ -38,9 +32,7 @@ </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="captcha_public_key">${_('ReCaptcha public key')}:</label> - </div> + <label class="control-label" for="captcha_public_key">${_('ReCaptcha public key')}:</label> <div class="input"> ${h.text('captcha_public_key',size=60)} <span class="help-block">${_('Public key for reCaptcha system.')}</span> @@ -48,9 +40,7 @@ </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="captcha_private_key">${_('ReCaptcha private key')}:</label> - </div> + <label class="control-label" for="captcha_private_key">${_('ReCaptcha private key')}:</label> <div class="input"> ${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>
--- 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 @@ <div class="form-horizontal"> % for hook in c.hooks: <div class="form-group"> - <div class="label label"> - <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label> - </div> + <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label> <div class="input" style="margin-left:280px"> ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")} </div> @@ -23,9 +21,7 @@ % for hook in c.custom_hooks: <div class="field" id="${'id%s' % hook.ui_id }"> - <div class="label label"> - <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label> - </div> + <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label> <div class="input" style="margin-left:280px"> ${h.hidden('hook_ui_key',hook.ui_key)} ${h.hidden('hook_ui_value',hook.ui_value)}
--- 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 @@ <div class="form"> <div class="form-horizontal"> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="destroy">${_('Rescan option')}:</label> - </div> + <label class="control-label" for="destroy">${_('Rescan option')}:</label> <div class="checkboxes"> <div class="checkbox"> ${h.checkbox('destroy',True)}
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label">${_('Index build option')}:</label> - </div> + <label class="control-label">${_('Index build option')}:</label> <div class="checkboxes"> <div class="checkbox"> ${h.checkbox('full_index',True)}
--- 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 @@ <div class="form"> <div class="form-horizontal"> <div class="form-group"> - <div class="label label-checkbox"> - <label>${_('Hooks')}:</label> - </div> + <label>${_('Hooks')}:</label> <div class="checkboxes"> <div class="checkbox"> ${h.checkbox('hooks_changegroup_repo_size','True')} @@ -25,9 +23,7 @@ </div> </div> <div class="form-group"> - <div class="label label-checkbox"> - <label>${_('Mercurial extensions')}:</label> - </div> + <label>${_('Mercurial extensions')}:</label> <div class="checkboxes"> <div class="checkbox"> ${h.checkbox('extensions_largefiles','True')} @@ -47,9 +43,7 @@ </div> %if c.visual.allow_repo_location_change: <div class="form-group"> - <div class="label"> - <label class="control-label" for="paths_root_path">${_('Location of repositories')}:</label> - </div> + <label class="control-label" for="paths_root_path">${_('Location of repositories')}:</label> <div class="input"> ${h.text('paths_root_path',size=60,readonly="readonly")} <span id="path_unlock" class="tooltip" style="cursor: pointer"
--- a/kallithea/templates/admin/settings/settings_visual.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_visual.html Thu Oct 27 16:01:57 2016 +0200 @@ -4,9 +4,7 @@ <div class="form-horizontal"> <div class="form-group"> - <div class="label label-checkbox"> - <label>${_('General')}:</label> - </div> + <label>${_('General')}:</label> <div class="checkboxes"> <div class="checkbox"> ${h.checkbox('repository_fields','True')} @@ -36,9 +34,7 @@ {netloc} network location/server host of running Kallithea server''')}</span> </div> </div> - <div class="label label-checkbox"> - <label>${_('Clone URL')}:</label> - </div> + <label>${_('Clone URL')}:</label> <div class="field"> <div class="input"> ${h.text('clone_uri_tmpl', size=80)} @@ -54,9 +50,7 @@ </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="dashboard_items">${_('Dashboard items')}:</label> - </div> + <label class="control-label" for="dashboard_items">${_('Dashboard items')}:</label> <div class="input"> ${h.text('dashboard_items',size=5)} <span class="help-block">${_('Number of items displayed in the main page dashboard before pagination is shown.')}</span> @@ -64,9 +58,7 @@ </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="admin_grid_items">${_('Admin pages items')}:</label> - </div> + <label class="control-label" for="admin_grid_items">${_('Admin pages items')}:</label> <div class="input"> ${h.text('admin_grid_items',size=5)} <span class="help-block">${_('Number of items displayed in the admin pages grids before pagination is shown.')}</span> @@ -74,9 +66,7 @@ </div> <div class="form-group"> - <div class="label label-checkbox"> - <label>${_('Icons')}:</label> - </div> + <label>${_('Icons')}:</label> <div class="checkboxes"> <div class="checkbox"> ${h.checkbox('show_public_icon','True')} @@ -91,9 +81,7 @@ </div> <div class="form-group"> - <div class="label label-checkbox"> - <label>${_('Meta Tagging')}:</label> - </div> + <label>${_('Meta Tagging')}:</label> <div class="checkboxes"> <div class="checkbox"> ${h.checkbox('stylify_metatags','True')}
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="users_group_name">${_('Group name')}:</label> - </div> + <label class="control-label" for="users_group_name">${_('Group name')}:</label> <div class="input"> ${h.text('users_group_name',class_='small')} </div> </div> <div class="form-group"> - <div class="label label-textarea"> - <label class="control-label" for="user_group_description">${_('Description')}:</label> - </div> + <label class="control-label" for="user_group_description">${_('Description')}:</label> <div class="textarea text-area editor"> ${h.textarea('user_group_description')} <span class="help-block">${_('Short, optional description for this user group.')}</span> </div> </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="users_group_active">${_('Active')}:</label> - </div> + <label class="control-label" for="users_group_active">${_('Active')}:</label> <div class="checkboxes"> ${h.checkbox('users_group_active',value=True, checked='checked')} </div>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="users_group_name">${_('Group name')}:</label> - </div> + <label class="control-label" for="users_group_name">${_('Group name')}:</label> <div class="input"> ${h.text('users_group_name',class_='large')} </div> </div> <div class="form-group"> - <div class="label label-textarea"> - <label class="control-label" for="user_group_description">${_('Description')}:</label> - </div> + <label class="control-label" for="user_group_description">${_('Description')}:</label> <div class="textarea-small editor"> ${h.textarea('user_group_description')} <span class="help-block">${_('Short, optional description for this user group.')}</span> </div> </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="users_group_active">${_('Active')}:</label> - </div> + <label class="control-label" for="users_group_active">${_('Active')}:</label> <div class="checkboxes"> ${h.checkbox('users_group_active',value=True)} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="users_group_active">${_('Members')}:</label> - </div> + <label class="control-label" for="users_group_active">${_('Members')}:</label> <div class="select"> <table class="table"> <tr>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="username">${_('Username')}:</label> - </div> + <label class="control-label" for="username">${_('Username')}:</label> <div class="input"> ${h.text('username',class_='small')} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="password">${_('Password')}:</label> - </div> + <label class="control-label" for="password">${_('Password')}:</label> <div class="input"> ${h.password('password',class_='small')} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="password_confirmation">${_('Password confirmation')}:</label> - </div> + <label class="control-label" for="password_confirmation">${_('Password confirmation')}:</label> <div class="input"> ${h.password('password_confirmation',class_="small")} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="firstname">${_('First Name')}:</label> - </div> + <label class="control-label" for="firstname">${_('First Name')}:</label> <div class="input"> ${h.text('firstname',class_='small')} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="lastname">${_('Last Name')}:</label> - </div> + <label class="control-label" for="lastname">${_('Last Name')}:</label> <div class="input"> ${h.text('lastname',class_='small')} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="email">${_('Email')}:</label> - </div> + <label class="control-label" for="email">${_('Email')}:</label> <div class="input"> ${h.text('email',class_='small')} </div> </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="active">${_('Active')}:</label> - </div> + <label class="control-label" for="active">${_('Active')}:</label> <div class="checkboxes"> ${h.checkbox('active',value=True,checked='checked')} </div>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="description">${_('New API key')}:</label> - </div> + <label class="control-label" for="description">${_('New API key')}:</label> <div class="input"> ${h.text('description', class_='medium', placeholder=_('Description'))} ${h.select('lifetime', '', c.lifetime_options)}
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="new_email">${_('New email address')}:</label> - </div> + <label class="control-label" for="new_email">${_('New email address')}:</label> <div class="input"> ${h.text('new_email', class_='medium')} </div>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="new_ip">${_('New IP address')}:</label> - </div> + <label class="control-label" for="new_ip">${_('New IP address')}:</label> <div class="input"> ${h.text('new_ip', class_='medium')} </div>
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="username">${_('Username')}:</label> - </div> + <label class="control-label" for="username">${_('Username')}:</label> <div class="input"> ${h.text('username',class_='medium', readonly=c.readonly('username'))} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="email">${_('Email')}:</label> - </div> + <label class="control-label" for="email">${_('Email')}:</label> <div class="input"> ${h.text('email',class_='medium', readonly=c.readonly('email'))} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="extern_type">${_('Source of Record')}:</label> - </div> + <label class="control-label" for="extern_type">${_('Source of Record')}:</label> <div class="input"> ${h.text('extern_type',class_='medium',readonly="readonly")} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="extern_name">${_('Name in Source of Record')}:</label> - </div> + <label class="control-label" for="extern_name">${_('Name in Source of Record')}:</label> <div class="input"> ${h.text('extern_name',class_='medium',readonly="readonly")} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="new_password">${_('New password')}:</label> - </div> + <label class="control-label" for="new_password">${_('New password')}:</label> <div class="input"> ${h.password('new_password',class_='medium',readonly=c.readonly('password'))} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="password_confirmation">${_('New password confirmation')}:</label> - </div> + <label class="control-label" for="password_confirmation">${_('New password confirmation')}:</label> <div class="input"> ${h.password('password_confirmation',class_="medium",readonly=c.readonly('password'))} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="firstname">${_('First Name')}:</label> - </div> + <label class="control-label" for="firstname">${_('First Name')}:</label> <div class="input"> ${h.text('firstname',class_='medium', readonly=c.readonly('firstname'))} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="lastname">${_('Last Name')}:</label> - </div> + <label class="control-label" for="lastname">${_('Last Name')}:</label> <div class="input"> ${h.text('lastname',class_='medium', readonly=c.readonly('lastname'))} </div> </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="active">${_('Active')}:</label> - </div> + <label class="control-label" for="active">${_('Active')}:</label> <div class="checkboxes"> ${h.checkbox('active',value=True, readonly=c.readonly('active'))} </div> </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="admin">${_('Admin')}:</label> - </div> + <label class="control-label" for="admin">${_('Admin')}:</label> <div class="checkboxes"> ${h.checkbox('admin',value=True, readonly=c.readonly('admin'))} </div>
--- 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 @@ <div class="form"> <div class="fields"> <div class="field"> - <div class="label"> - <label for="username">${_('Username')}:</label> - </div> + <label for="username">${_('Username')}:</label> <div class="input"> ${h.text('username',class_='focus')} </div> </div> <div class="field"> - <div class="label"> - <label for="password">${_('Password')}:</label> - </div> + <label for="password">${_('Password')}:</label> <div class="input"> ${h.password('password',class_='focus')} </div>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="inherit_default_permissions">${_('Inherit defaults')}:</label> - </div> + <label class="control-label" for="inherit_default_permissions">${_('Inherit defaults')}:</label> <div class="checkboxes"> ${h.checkbox('inherit_default_permissions',value=True)} <span class="help-block"> @@ -24,9 +22,7 @@ <div id="inherit_overlay"> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="create_repo_perm">${_('Create repositories')}:</label> - </div> + <label class="control-label" for="create_repo_perm">${_('Create repositories')}:</label> <div class="checkboxes"> ${h.checkbox('create_repo_perm',value=True)} <span class="help-block"> @@ -36,9 +32,7 @@ </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="create_user_group_perm">${_('Create user groups')}:</label> - </div> + <label class="control-label" for="create_user_group_perm">${_('Create user groups')}:</label> <div class="checkboxes"> ${h.checkbox('create_user_group_perm',value=True)} <span class="help-block"> @@ -48,9 +42,7 @@ </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="fork_repo_perm">${_('Fork repositories')}:</label> - </div> + <label class="control-label" for="fork_repo_perm">${_('Fork repositories')}:</label> <div class="checkboxes"> ${h.checkbox('fork_repo_perm',value=True)} <span class="help-block">
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="repo_name">${_('Fork name')}:</label> - </div> + <label class="control-label" for="repo_name">${_('Fork name')}:</label> <div class="input"> ${h.text('repo_name',class_="small")} ${h.hidden('repo_type',c.repo_info.repo_type)} @@ -34,9 +32,7 @@ </div> <div class="form-group"> - <div class="label label-textarea"> - <label class="control-label" for="description">${_('Description')}:</label> - </div> + <label class="control-label" for="description">${_('Description')}:</label> <div class="textarea editor"> ${h.textarea('description')} <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span> @@ -44,9 +40,7 @@ </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="repo_group">${_('Repository group')}:</label> - </div> + <label class="control-label" for="repo_group">${_('Repository group')}:</label> <div class="input"> ${h.select('repo_group','',c.repo_groups,class_="medium")} <span class="help-block">${_('Optionally select a group to put this repository into.')}</span> @@ -54,9 +48,7 @@ </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="landing_rev">${_('Landing revision')}:</label> - </div> + <label class="control-label" for="landing_rev">${_('Landing revision')}:</label> <div class="input"> ${h.select('landing_rev','',c.landing_revs,class_="medium")} <span class="help-block">${_('Default revision for files page, downloads, whoosh, and readme.')}</span> @@ -64,9 +56,7 @@ </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="private">${_('Private')}:</label> - </div> + <label class="control-label" for="private">${_('Private')}:</label> <div class="checkboxes"> ${h.checkbox('private',value="True")} <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span> @@ -74,9 +64,7 @@ </div> <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="private">${_('Copy permissions')}:</label> - </div> + <label class="control-label" for="private">${_('Copy permissions')}:</label> <div class="checkboxes"> ${h.checkbox('copy_permissions',value="True", checked="checked")} <span class="help-block">${_('Copy permissions from forked repository')}</span> @@ -85,9 +73,7 @@ %if c.can_update: <div class="form-group"> - <div class="label label-checkbox"> - <label class="control-label" for="private">${_('Update after clone')}:</label> - </div> + <label class="control-label" for="private">${_('Update after clone')}:</label> <div class="checkboxes"> ${h.checkbox('update_after_clone',value="True")} <span class="help-block">${_('Checkout source after making a clone')}</span>
--- 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 @@ <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="email">${_('Email Address')}:</label> - </div> + <label class="control-label" for="email">${_('Email Address')}:</label> <div class="input"> ${h.text('email')} </div> @@ -31,9 +29,7 @@ %if c.captcha_active: <div class="form-group"> - <div class="label"> - <label class="control-label" for="email">${_('Captcha')}:</label> - </div> + <label class="control-label" for="email">${_('Captcha')}:</label> <div class="input"> ${h.hidden('recaptcha_field')} <div id="recaptcha"></div>
--- 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 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="token">${_('Code you received in the email')}:</label> - </div> + <label class="control-label" for="token">${_('Code you received in the email')}:</label> <div class="input"> ${h.text('token', class_='focus')} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="password">${_('New Password')}:</label> - </div> + <label class="control-label" for="password">${_('New Password')}:</label> <div class="input"> ${h.password('password',class_='focus')} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="password_confirm">${_('Confirm New Password')}:</label> - </div> + <label class="control-label" for="password_confirm">${_('Confirm New Password')}:</label> <div class="input"> ${h.password('password_confirm',class_='focus')} </div>
--- 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 @@ <div class="form-horizontal" style="float:left;width:50%;padding-right:30px;"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="pullrequest_title">${_('Title')}:</label> - </div> + <label class="control-label" for="pullrequest_title">${_('Title')}:</label> <div class="input"> ${h.text('pullrequest_title',class_="large",placeholder=_('Summarize the changes - or leave empty'))} </div> </div> <div class="form-group"> - <div class="label label-textarea"> - <label class="control-label" for="pullrequest_desc">${_('Description')}:</label> - </div> + <label class="control-label" for="pullrequest_desc">${_('Description')}:</label> <div class="textarea text-area editor"> ${h.textarea('pullrequest_desc',size=30,placeholder=_('Write a short description on this pull request'))} </div> </div> <div class="form-group"> - <div class="label label-textarea"> - <label class="control-label" for="pullrequest_desc">${_('Changeset flow')}:</label> - </div> + <label class="control-label" for="pullrequest_desc">${_('Changeset flow')}:</label> <div class="input"> ##ORG <div>
--- 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 @@ <div id="pr-summary" class="fields"> <div class="field pr-not-edit" style="min-height:37px"> - <div class="label-summary"> <label>${_('Description')}:</label> %if editable: - <div style="margin: 5px"> + <div style="margin: 25px 5px; position: absolute"> <a class="btn btn-default btn-xs" 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> @@ -50,18 +48,14 @@ %if editable: <div class="pr-do-edit" style="display:none"> <div class="field"> - <div class="label-summary"> - <label for="pullrequest_title">${_('Title')}:</label> - </div> + <label for="pullrequest_title">${_('Title')}:</label> <div class="input"> ${h.text('pullrequest_title',class_="large",value=c.pull_request.title,placeholder=_('Summarize the changes'))} </div> </div> <div class="field"> - <div class="label-summary label-textarea"> - <label for="pullrequest_desc">${_('Description')}:</label> - </div> + <label for="pullrequest_desc">${_('Description')}:</label> <div class="textarea text-area editor"> ${h.textarea('pullrequest_desc',size=30,content=c.pull_request.description,placeholder=_('Write a short description on this pull request'))} </div> @@ -70,9 +64,7 @@ %endif <div class="field"> - <div class="label-summary"> - <label>${_('Reviewer voting result')}:</label> - </div> + <label>${_('Reviewer voting result')}:</label> <div class="input"> <div class="changeset-status-container" style="float:none;clear:both"> %if c.current_voting_result: @@ -89,9 +81,7 @@ </div> </div> <div class="field"> - <div class="label-summary"> - <label>${_('Still not reviewed by')}:</label> - </div> + <label>${_('Still not reviewed by')}:</label> <div class="input"> % if len(c.pull_request_pending_reviewers) > 0: <div class="tooltip" title="${', '.join([x.username for x in c.pull_request_pending_reviewers])}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div> @@ -103,9 +93,7 @@ </div> </div> <div class="field"> - <div class="label-summary"> - <label>${_('Origin')}:</label> - </div> + <label>${_('Origin')}:</label> <div class="input"> <div> ${h.link_to_ref(c.pull_request.org_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)} @@ -116,9 +104,7 @@ </div> </div> <div class="field"> - <div class="label-summary"> - <label>${_('Target')}:</label> - </div> + <label>${_('Target')}:</label> <div class="input"> %if c.is_range: ${_("This is just a range of changesets and doesn't have a target or a real merge ancestor.")} @@ -129,9 +115,7 @@ </div> </div> <div class="field"> - <div class="label-summary"> - <label>${_('Pull changes')}:</label> - </div> + <label>${_('Pull changes')}:</label> <div class="input"> %if c.cs_ranges: <div> @@ -146,17 +130,13 @@ </div> </div> <div class="field"> - <div class="label-summary"> - <label>${_('Created on')}:</label> - </div> + <label>${_('Created on')}:</label> <div class="input"> <div>${h.fmt_date(c.pull_request.created_on)}</div> </div> </div> <div class="field"> - <div class="label-summary"> - <label>${_('Owner')}:</label> - </div> + <label>${_('Owner')}:</label> <div class="input pr-not-edit"> ${h.gravatar_div(c.pull_request.owner.email, size=20)} <span>${c.pull_request.owner.full_name_and_username}</span><br/> @@ -169,9 +149,7 @@ </div> <div class="field"> - <div class="label-summary"> - <label>${_('Next iteration')}:</label> - </div> + <label>${_('Next iteration')}:</label> <div class="input"> <div class="msg-div">${c.update_msg}</div> %if c.avail_revs:
--- a/kallithea/templates/register.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/register.html Thu Oct 27 16:01:57 2016 +0200 @@ -20,54 +20,42 @@ <!-- fields --> <div class="form-horizontal"> <div class="form-group"> - <div class="label"> - <label class="control-label" for="username">${_('Username')}:</label> - </div> + <label class="control-label" for="username">${_('Username')}:</label> <div class="input"> ${h.text('username',class_="medium")} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="password">${_('Password')}:</label> - </div> + <label class="control-label" for="password">${_('Password')}:</label> <div class="input"> ${h.password('password',class_="medium")} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="password_confirmation">${_('Re-enter password')}:</label> - </div> + <label class="control-label" for="password_confirmation">${_('Re-enter password')}:</label> <div class="input"> ${h.password('password_confirmation',class_="medium")} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="firstname">${_('First Name')}:</label> - </div> + <label class="control-label" for="firstname">${_('First Name')}:</label> <div class="input"> ${h.text('firstname',class_="medium")} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="lastname">${_('Last Name')}:</label> - </div> + <label class="control-label" for="lastname">${_('Last Name')}:</label> <div class="input"> ${h.text('lastname',class_="medium")} </div> </div> <div class="form-group"> - <div class="label"> - <label class="control-label" for="email">${_('Email')}:</label> - </div> + <label class="control-label" for="email">${_('Email')}:</label> <div class="input"> ${h.text('email',class_="medium")} </div> @@ -75,9 +63,7 @@ %if c.captcha_active: <div class="form-group"> - <div class="label"> - <label class="control-label" for="email">${_('Captcha')}:</label> - </div> + <label class="control-label" for="email">${_('Captcha')}:</label> <div class="input"> ${h.hidden('recaptcha_field')} <div id="recaptcha"></div>
--- a/kallithea/templates/search/search.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/search/search.html Thu Oct 27 16:01:57 2016 +0200 @@ -46,9 +46,7 @@ <div class="form"> <div class="form-horizontal"> <div class="field field-first field-noborder"> - <div class="label"> - <label class="control-label" for="q">${_('Search term')}:</label> - </div> + <label class="control-label" for="q">${_('Search term')}:</label> <div class="input">${h.text('q',c.cur_query,class_="small")} <div class="button highlight"> <input type="submit" value="${_('Search')}" class="btn btn-default"/> @@ -58,9 +56,7 @@ </div> <div class="form-group"> - <div class="label"> - <label for="type">${_('Search in')}:</label> - </div> + <label for="type">${_('Search in')}:</label> <div class="select"> ${h.select('type',c.cur_type,[('content',_('File contents')), ('commit',_('Commit messages')),
--- a/kallithea/templates/summary/summary.html Mon Oct 24 22:38:25 2016 +0200 +++ b/kallithea/templates/summary/summary.html Thu Oct 27 16:01:57 2016 +0200 @@ -68,9 +68,7 @@ <div class="form"> <div id="summary" class="form-horizontal"> <div class="form-group"> - <div class="label-summary"> - <label>${_('Clone URL')}:</label> - </div> + <label>${_('Clone URL')}:</label> <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}"/> @@ -81,16 +79,12 @@ </div> <div class="form-group"> - <div class="label-summary"> - <label>${_('Description')}:</label> - </div> + <label>${_('Description')}:</label> <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(c.db_repo.description, stylize=c.visual.stylify_metatags)}</div> </div> <div class="form-group"> - <div class="label-summary"> - <label>${_('Trending files')}:</label> - </div> + <label>${_('Trending files')}:</label> <div class="input ${summary(c.show_stats)}"> %if c.show_stats: <div id="lang_stats"></div> @@ -104,9 +98,7 @@ </div> <div class="form-group"> - <div class="label-summary"> - <label>${_('Download')}:</label> - </div> + <label>${_('Download')}:</label> <div class="input ${summary(c.show_stats)}"> %if len(c.db_repo_scm_instance.revisions) == 0: ${_('There are no downloads yet')}