Mercurial > kallithea
changeset 6351:dd42c2ad28d7
style: drop 'input' class inside 'form-group'
As long as we use the old styling, just apply styling to div inside form-group.
Based on work by Dominik Ruf.
line wrap: on
line diff
--- a/kallithea/public/css/style.css Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/public/css/style.css Sun Dec 04 22:53:36 2016 +0100 @@ -846,28 +846,26 @@ font-weight: 700; } -#content div.panel div.form div.form-horizontal div.form-group div.input { +#content div.panel div.form div.form-horizontal div.form-group > div { margin: 0 20px 0 200px; } -#content div.panel div.form div.form-horizontal div.form-group div.input.summary { - margin: 0 0 0 110px; -} -#content div.panel div.form div.form-horizontal div.form-group div.input.summary-short { +#content div.panel div.form div.form-horizontal div.form-group > div.summary, +#content div.panel div.form div.form-horizontal div.form-group > div.summary-short { margin: 10px 20px 10px 110px; } #content div.panel div.form div.form-horizontal div.form-group > div.summary-short input { margin: 0; } -#content div.panel div.form div.form-horizontal div.form-group div.file { +#content div.panel div.form div.form-horizontal div.form-group > div.file { margin: 0 20px 0 200px; } -#content div.panel div.form div.form-horizontal div.form-group div.editor { +#content div.panel div.form div.form-horizontal div.form-group > div.editor { margin: 0 10px 0 200px; } #content div.panel div.form div.form-horizontal div.form-group > label > input, -#content div.panel div.form div.form-horizontal div.form-group div.input input, +#content div.panel div.form div.form-horizontal div.form-group > div input, .reviewer_ac input { background: #FFF; border-top: 1px solid #b3b3b3; @@ -880,8 +878,8 @@ padding: 7px 7px 6px; } -#content div.panel div.form div.form-horizontal div.form-group div.input input#clone_url, -#content div.panel div.form div.form-horizontal div.form-group div.input input#clone_url_id +#content div.panel div.form div.form-horizontal div.form-group > div input#clone_url, +#content div.panel div.form div.form-horizontal div.form-group > div input#clone_url_id { font-size: 14px; padding: 0 2px; @@ -905,16 +903,16 @@ #content div.panel div.form div.form-horizontal div.form-group > div select.form-control, #content div.panel div.form div.form-horizontal div.form-group > div div.form-control.select2-container, -#content div.panel div.form div.form-horizontal div.form-group div.input input.form-control { +#content div.panel div.form div.form-horizontal div.form-group > div input.form-control { width: 100%; margin: 5px 0 10px; } -#content div.panel div.form div.form-horizontal div.form-group div.input input.date { +#content div.panel div.form div.form-horizontal div.form-group > div input.date { width: 177px; } -#content div.panel div.form div.form-horizontal div.form-group div.input input.button { +#content div.panel div.form div.form-horizontal div.form-group > div input.button { background: #D4D0C8; border-top: 1px solid #FFF; border-left: 1px solid #FFF; @@ -1541,7 +1539,7 @@ padding-bottom: 3px; } -#quick_login div.form div.form-horizontal div.form-group div.input input { +#quick_login div.form div.form-horizontal div.form-group > div input { width: 236px; background: #FFF; border-top: 1px solid #b3b3b3; @@ -1621,7 +1619,7 @@ padding: 5px 0 0 5px; } -#register div.form div.form-horizontal div.form-group div.input input { +#register div.form div.form-horizontal div.form-group > div input { width: 300px; background: #FFF; border-top: 1px solid #b3b3b3; @@ -2964,7 +2962,7 @@ border-left: 1px solid #576622; } -#content div.panel div.panel-heading div.search div.input input { +#content div.panel div.panel-heading div.search > div input { border: 1px solid #576622; } @@ -3252,9 +3250,9 @@ padding: 0; } -#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, -#register div.form div.form-horizontal div.form-group div.input input.error { +#content div.panel div.form div.form-horizontal div.form-group > div input.error, +#login div.form div.form-horizontal div.form-group > div input.error, +#register div.form div.form-horizontal div.form-group > div input.error { background: #FBE3E4; border-top: 1px solid #e1b2b3; border-left: 1px solid #e1b2b3; @@ -3262,9 +3260,9 @@ border-bottom: 1px solid #FBC2C4; } -#content div.panel div.form div.form-horizontal div.form-group div.input input.success, -#login div.form div.form-horizontal div.form-group div.input input.success, -#register div.form div.form-horizontal div.form-group div.input input.success { +#content div.panel div.form div.form-horizontal div.form-group > div input.success, +#login div.form div.form-horizontal div.form-group > div input.success, +#register div.form div.form-horizontal div.form-group > div input.success { background: #E6EFC2; border-top: 1px solid #cebb98; border-left: 1px solid #cebb98; @@ -3351,8 +3349,8 @@ } #content div.panel div.action div.button, -#login div.form div.form-horizontal div.form-group div.input div.link, -#register div.form div.form-horizontal div.form-group div.input div.link { +#login div.form div.form-horizontal div.form-group > div div.link, +#register div.form div.form-horizontal div.form-group > div div.link { text-align: right; margin: 6px 0 0; padding: 0; @@ -3415,7 +3413,7 @@ } #login div.form div.form-horizontal div.form-group div, -#register div.form div.form-horizontal div.form-group div.input { +#register div.form div.form-horizontal div.form-group > div { float: left; margin: 0; padding: 0;
--- a/kallithea/templates/admin/auth/auth_settings.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/auth/auth_settings.html Sun Dec 04 22:53:36 2016 +0100 @@ -29,7 +29,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="auth_plugins">${_("Enabled Plugins")}</label> - <div class="input">${h.text("auth_plugins", class_='form-control')} + <div>${h.text("auth_plugins", class_='form-control')} <span class="help-block">${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}</span> <div style="padding:10px 0px 10px 0px;font-weight: bold">${_('Available built-in plugins')}</div> <ul> @@ -59,7 +59,7 @@ %if setting["type"] == "password": <div class="form-group"> <label class="control-label" for="${fullsetting}">${_(displayname)}</label> - <div class="input"> + <div> ${h.password(fullsetting,class_='form-control')} <span class="help-block">${setting["description"]}</span> </div> @@ -67,7 +67,7 @@ %elif setting["type"] in ["string", "int"]: <div class="form-group"> <label class="control-label" for="${fullsetting}">${_(displayname)}</label> - <div class="input"> + <div> ${h.text(fullsetting,class_='form-control')} <span class="help-block">${setting["description"]}</span> </div> @@ -91,7 +91,7 @@ %else: <div class="form-group"> <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> + <div>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> %endif
--- a/kallithea/templates/admin/defaults/defaults.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/defaults/defaults.html Sun Dec 04 22:53:36 2016 +0100 @@ -30,7 +30,7 @@ <div class="form-group"> <label class="control-label" for="default_repo_type">${_('Type')}:</label> - <div class="input"> + <div> ${h.select('default_repo_type','hg',c.backends,class_='form-control')} </div> </div>
--- a/kallithea/templates/admin/my_account/my_account_api_keys.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/my_account/my_account_api_keys.html Sun Dec 04 22:53:36 2016 +0100 @@ -58,7 +58,7 @@ <div class="form-horizontal"> <div class="form-group"> <label for="description">${_('New API key')}:</label> - <div class="input"> + <div> ${h.text('description', class_='form-control', placeholder=_('Description'))} ${h.select('lifetime', '', c.lifetime_options)} </div>
--- a/kallithea/templates/admin/my_account/my_account_emails.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/my_account/my_account_emails.html Sun Dec 04 22:53:36 2016 +0100 @@ -39,7 +39,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="new_email">${_('New email address')}:</label> - <div class="input"> + <div> ${h.text('new_email', class_='form-control')} </div> </div>
--- a/kallithea/templates/admin/my_account/my_account_password.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/my_account/my_account_password.html Sun Dec 04 22:53:36 2016 +0100 @@ -7,21 +7,21 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="current_password">${_('Current password')}:</label> - <div class="input"> + <div> ${h.password('current_password',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="new_password">${_('New password')}:</label> - <div class="input"> + <div> ${h.password('new_password',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="new_password_confirmation">${_('Confirm new password')}:</label> - <div class="input"> + <div> ${h.password('new_password_confirmation',class_='form-control')} </div> </div>
--- a/kallithea/templates/admin/my_account/my_account_profile.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/my_account/my_account_profile.html Sun Dec 04 22:53:36 2016 +0100 @@ -19,28 +19,28 @@ <div class="form-group"> <label class="control-label" for="username">${_('Username')}:</label> - <div class="input"> + <div> ${h.text('username',class_='form-control', readonly=c.readonly('username'))} </div> </div> <div class="form-group"> <label class="control-label" for="firstname">${_('First Name')}:</label> - <div class="input"> + <div> ${h.text('firstname',class_='form-control', readonly=c.readonly('firstname'))} </div> </div> <div class="form-group"> <label class="control-label" for="lastname">${_('Last Name')}:</label> - <div class="input"> + <div> ${h.text('lastname',class_='form-control', readonly=c.readonly('lastname'))} </div> </div> <div class="form-group"> <label class="control-label" for="email">${_('Email')}:</label> - <div class="input"> + <div> ${h.text('email',class_='form-control', readonly=c.readonly('email'))} </div> </div>
--- a/kallithea/templates/admin/permissions/permissions_ips.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Sun Dec 04 22:53:36 2016 +0100 @@ -27,7 +27,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="new_ip">${_('New IP address')}:</label> - <div class="input"> + <div> ${h.hidden('default_user', 'True')} ${h.text('new_ip', class_='form-control')} </div>
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Sun Dec 04 22:53:36 2016 +0100 @@ -30,7 +30,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="group_name">${_('Group name')}:</label> - <div class="input"> + <div> ${h.text('group_name',class_='form-control')} </div> </div> @@ -44,7 +44,7 @@ <div class="form-group"> <label class="control-label" for="parent_group_id">${_('Group parent')}:</label> - <div class="input"> + <div> ${h.select('parent_group_id',request.GET.get('parent_group'),c.repo_groups,class_='form-control')} </div> </div>
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Sun Dec 04 22:53:36 2016 +0100 @@ -5,7 +5,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="group_name">${_('Group name')}:</label> - <div class="input"> + <div> ${h.text('group_name',class_='form-control')} </div> </div> @@ -19,7 +19,7 @@ <div class="form-group"> <label class="control-label" for="parent_group_id">${_('Group parent')}:</label> - <div class="input"> + <div> ${h.select('parent_group_id','',c.repo_groups,class_='form-control')} </div> </div>
--- a/kallithea/templates/admin/repos/repo_add_base.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/repos/repo_add_base.html Sun Dec 04 22:53:36 2016 +0100 @@ -6,13 +6,13 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="repo_name">${_('Name')}:</label> - <div class="input"> + <div> ${h.text('repo_name',class_='form-control')} </div> </div> <div id="remote_clone" class="form-group"> <label class="control-label" for="clone_uri">${_('Clone remote repository')}:</label> - <div class="input"> + <div> ${h.text('clone_uri',class_='form-control')} <span class="help-block"> ${_('Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL.')} @@ -28,7 +28,7 @@ </div> <div class="form-group"> <label class="control-label" for="repo_group">${_('Repository group')}:</label> - <div class="input"> + <div> ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_='form-control')} <span class="help-block">${_('Optionally select a group to put this repository into.')}</span> </div> @@ -42,14 +42,14 @@ </div> <div class="form-group"> <label class="control-label" for="repo_type">${_('Type')}:</label> - <div class="input"> + <div> ${h.select('repo_type','hg',c.backends,class_='form-control')} <span class="help-block">${_('Type of repository to create.')}</span> </div> </div> <div class="form-group"> <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label> - <div class="input"> + <div> ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')} <span class="help-block">${_('Default revision for files page, downloads, full text search index and readme generation')}</span> </div>
--- a/kallithea/templates/admin/repos/repo_edit_fields.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/repos/repo_edit_fields.html Sun Dec 04 22:53:36 2016 +0100 @@ -30,21 +30,21 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="new_field_key">${_('New field key')}:</label> - <div class="input"> + <div> ${h.text('new_field_key', class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="new_field_label">${_('New field label')}:</label> - <div class="input"> + <div> ${h.text('new_field_label', class_='form-control', placeholder=_('Enter short label'))} </div> </div> <div class="form-group"> <label class="control-label" for="new_field_desc">${_('New field description')}:</label> - <div class="input"> + <div> ${h.text('new_field_desc', class_='form-control', placeholder=_('Enter description of a field'))} </div> </div>
--- a/kallithea/templates/admin/repos/repo_edit_settings.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/repos/repo_edit_settings.html Sun Dec 04 22:53:36 2016 +0100 @@ -4,7 +4,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="repo_name">${_('Name')}:</label> - <div class="input"> + <div> ${h.text('repo_name',class_='form-control')} <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> <span id="clone_id" class="help-block" style="display: none"> @@ -16,7 +16,7 @@ </div> <div class="form-group"> <label class="control-label" for="clone_uri">${_('Remote repository')}:</label> - <div class="input"> + <div> <div id="alter_clone_uri"> ${h.text('clone_uri',class_='form-control', placeholder=_('Repository URL'))} ${h.hidden('clone_uri_hidden', c.repo_info.clone_uri_hidden)} @@ -28,21 +28,21 @@ </div> <div class="form-group"> <label class="control-label" for="repo_group">${_('Repository group')}:</label> - <div class="input"> + <div> ${h.select('repo_group','',c.repo_groups,class_='form-control')} <span class="help-block">${_('Optionally select a group to put this repository into.')}</span> </div> </div> <div class="form-group"> <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label> - <div class="input"> + <div> ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')} <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span> </div> </div> <div class="form-group"> <label class="control-label" for="owner">${_('Owner')}:</label> - <div class="input input-medium ac"> + <div class="ac"> <div class="perm_ac"> ${h.text('owner',class_='yui-ac-input')} <span class="help-block">${_('Change owner of this repository.')}</span> @@ -92,7 +92,7 @@ %for field in c.repo_fields: <div class="form-group"> <label class="control-label" for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label> - <div class="input input-medium"> + <div> ${h.text(field.field_key_prefixed, field.field_value, class_='form-control')} %if field.field_desc: <span class="help-block">${field.field_desc}</span>
--- a/kallithea/templates/admin/settings/settings_email.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/settings/settings_email.html Sun Dec 04 22:53:36 2016 +0100 @@ -4,7 +4,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="test_email">${_('Send test email to')}:</label> - <div class="input"> + <div> ${h.text('test_email',size=30)} </div> </div>
--- a/kallithea/templates/admin/settings/settings_global.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/settings/settings_global.html Sun Dec 04 22:53:36 2016 +0100 @@ -5,7 +5,7 @@ <div class="form-group"> <label class="control-label" for="title">${_('Site branding')}:</label> - <div class="input"> + <div> ${h.text('title',size=30)} <span class="help-block">${_('Set a custom title for your Kallithea Service.')}</span> </div> @@ -13,14 +13,14 @@ <div class="form-group"> <label class="control-label" for="realm">${_('HTTP authentication realm')}:</label> - <div class="input"> + <div> ${h.text('realm',size=30)} </div> </div> <div class="form-group"> <label class="control-label" for="ga_code">${_('HTML/JavaScript/CSS customization block')}:</label> - <div class="input"> + <div> ${h.textarea('ga_code', cols=80, rows=10)} <span class="help-block">${_('HTML (possibly with \ JavaScript and/or CSS) that will be added to the bottom \ @@ -33,7 +33,7 @@ <div class="form-group"> <label class="control-label" for="captcha_public_key">${_('ReCaptcha public key')}:</label> - <div class="input"> + <div> ${h.text('captcha_public_key',size=60)} <span class="help-block">${_('Public key for reCaptcha system.')}</span> </div> @@ -41,7 +41,7 @@ <div class="form-group"> <label class="control-label" for="captcha_private_key">${_('ReCaptcha private key')}:</label> - <div class="input"> + <div> ${h.text('captcha_private_key',size=60)} <span class="help-block">${_('Private key for reCaptcha system. Setting this value will enable captcha on registration.')}</span> </div>
--- a/kallithea/templates/admin/settings/settings_hooks.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/settings/settings_hooks.html Sun Dec 04 22:53:36 2016 +0100 @@ -4,7 +4,7 @@ % for hook in c.hooks: <div class="form-group"> <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label> - <div class="input" style="margin-left:280px"> + <div style="margin-left:280px"> ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")} </div> </div> @@ -22,7 +22,7 @@ %for hook in c.custom_hooks: <div class="form-group" id="${'id%s' % hook.ui_id }"> <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label> - <div class="input" style="margin-left:280px"> + <div style="margin-left:280px"> ${h.hidden('hook_ui_key',hook.ui_key)} ${h.hidden('hook_ui_value',hook.ui_value)} ${h.text('hook_ui_value_new',hook.ui_value,size=60)} @@ -39,7 +39,7 @@ <label> ${h.text('new_hook_ui_key',size=20)} </label> - <div class="input" style="margin-left:280px"> + <div style="margin-left:280px"> ${h.text('new_hook_ui_value',size=60)} </div> </div>
--- a/kallithea/templates/admin/settings/settings_vcs.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/settings/settings_vcs.html Sun Dec 04 22:53:36 2016 +0100 @@ -44,7 +44,7 @@ %if c.visual.allow_repo_location_change: <div class="form-group"> <label class="control-label" for="paths_root_path">${_('Location of repositories')}:</label> - <div class="input"> + <div> ${h.text('paths_root_path',size=60,readonly="readonly")} <span id="path_unlock" data-toggle="tooltip" style="cursor: pointer" title="${_('Click to unlock. You must restart Kallithea in order to make this setting take effect.')}">
--- a/kallithea/templates/admin/settings/settings_visual.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/settings/settings_visual.html Sun Dec 04 22:53:36 2016 +0100 @@ -23,7 +23,7 @@ <label for="use_gravatar">${_('Use Gravatars in Kallithea')}</label> </div> </div> - <div class="input"> + <div> ${h.text('gravatar_url', size=80)} <span class="help-block">${_('''Gravatar URL allows you to use another avatar server application. The following variables of the URL will be replaced accordingly. @@ -37,7 +37,7 @@ <div class="form-group"> <label>${_('Clone URL')}:</label> - <div class="input"> + <div> ${h.text('clone_uri_tmpl', size=80)} <span class="help-block">${_('''Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'. The following variables are available: @@ -51,7 +51,7 @@ <div class="form-group"> <label class="control-label" for="page_size">${_('Repository page size')}:</label> - <div class="input"> + <div> ${h.text('page_size',size=5)} <span class="help-block">${_('Number of items displayed in the repository pages before pagination is shown.')}</span> </div> @@ -59,7 +59,7 @@ <div class="form-group"> <label class="control-label" for="admin_grid_items">${_('Admin page size')}:</label> - <div class="input"> + <div> ${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> </div>
--- a/kallithea/templates/admin/user_groups/user_group_add.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/user_groups/user_group_add.html Sun Dec 04 22:53:36 2016 +0100 @@ -29,7 +29,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="users_group_name">${_('Group name')}:</label> - <div class="input"> + <div> ${h.text('users_group_name',class_='form-control')} </div> </div>
--- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html Sun Dec 04 22:53:36 2016 +0100 @@ -4,7 +4,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="users_group_name">${_('Group name')}:</label> - <div class="input"> + <div> ${h.text('users_group_name',class_='form-control')} </div> </div>
--- a/kallithea/templates/admin/users/user_add.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/users/user_add.html Sun Dec 04 22:53:36 2016 +0100 @@ -29,42 +29,42 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="username">${_('Username')}:</label> - <div class="input"> + <div> ${h.text('username',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="password">${_('Password')}:</label> - <div class="input"> + <div> ${h.password('password',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="password_confirmation">${_('Password confirmation')}:</label> - <div class="input"> + <div> ${h.password('password_confirmation',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="firstname">${_('First Name')}:</label> - <div class="input"> + <div> ${h.text('firstname',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="lastname">${_('Last Name')}:</label> - <div class="input"> + <div> ${h.text('lastname',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="email">${_('Email')}:</label> - <div class="input"> + <div> ${h.text('email',class_='form-control')} </div> </div>
--- a/kallithea/templates/admin/users/user_edit_api_keys.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/users/user_edit_api_keys.html Sun Dec 04 22:53:36 2016 +0100 @@ -58,7 +58,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="description">${_('New API key')}:</label> - <div class="input"> + <div> ${h.text('description', class_='form-control', placeholder=_('Description'))} ${h.select('lifetime', '', c.lifetime_options)} </div>
--- a/kallithea/templates/admin/users/user_edit_emails.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/users/user_edit_emails.html Sun Dec 04 22:53:36 2016 +0100 @@ -39,7 +39,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="new_email">${_('New email address')}:</label> - <div class="input"> + <div> ${h.text('new_email', class_='form-control')} </div> </div>
--- a/kallithea/templates/admin/users/user_edit_ips.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/users/user_edit_ips.html Sun Dec 04 22:53:36 2016 +0100 @@ -39,7 +39,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="new_ip">${_('New IP address')}:</label> - <div class="input"> + <div> ${h.text('new_ip', class_='form-control')} </div> </div>
--- a/kallithea/templates/admin/users/user_edit_profile.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/admin/users/user_edit_profile.html Sun Dec 04 22:53:36 2016 +0100 @@ -21,56 +21,56 @@ <div class="form-group"> <label class="control-label" for="username">${_('Username')}:</label> - <div class="input"> + <div> ${h.text('username',class_='form-control', readonly=c.readonly('username'))} </div> </div> <div class="form-group"> <label class="control-label" for="email">${_('Email')}:</label> - <div class="input"> + <div> ${h.text('email',class_='form-control', readonly=c.readonly('email'))} </div> </div> <div class="form-group"> <label class="control-label" for="extern_type">${_('Source of Record')}:</label> - <div class="input"> + <div> ${h.text('extern_type',class_='form-control',readonly="readonly")} </div> </div> <div class="form-group"> <label class="control-label" for="extern_name">${_('Name in Source of Record')}:</label> - <div class="input"> + <div> ${h.text('extern_name',class_='form-control',readonly="readonly")} </div> </div> <div class="form-group"> <label class="control-label" for="new_password">${_('New password')}:</label> - <div class="input"> + <div> ${h.password('new_password',class_='form-control',readonly=c.readonly('password'))} </div> </div> <div class="form-group"> <label class="control-label" for="password_confirmation">${_('New password confirmation')}:</label> - <div class="input"> + <div> ${h.password('password_confirmation',class_='form-control',readonly=c.readonly('password'))} </div> </div> <div class="form-group"> <label class="control-label" for="firstname">${_('First Name')}:</label> - <div class="input"> + <div> ${h.text('firstname',class_='form-control', readonly=c.readonly('firstname'))} </div> </div> <div class="form-group"> <label class="control-label" for="lastname">${_('Last Name')}:</label> - <div class="input"> + <div> ${h.text('lastname',class_='form-control', readonly=c.readonly('lastname'))} </div> </div>
--- a/kallithea/templates/base/base.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/base/base.html Sun Dec 04 22:53:36 2016 +0100 @@ -373,14 +373,14 @@ <div class="fields"> <div> <label for="username">${_('Username')}:</label> - <div class="input"> + <div> ${h.text('username',class_='form-control')} </div> </div> <div> <label for="password">${_('Password')}:</label> - <div class="input"> + <div> ${h.password('password',class_='form-control')} </div>
--- a/kallithea/templates/forks/fork.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/forks/fork.html Sun Dec 04 22:53:36 2016 +0100 @@ -24,7 +24,7 @@ <div class="form-group"> <label class="control-label" for="repo_name">${_('Fork name')}:</label> - <div class="input"> + <div> ${h.text('repo_name',class_='form-control')} ${h.hidden('repo_type',c.repo_info.repo_type)} ${h.hidden('fork_parent_id',c.repo_info.repo_id)} @@ -41,7 +41,7 @@ <div class="form-group"> <label class="control-label" for="repo_group">${_('Repository group')}:</label> - <div class="input"> + <div> ${h.select('repo_group','',c.repo_groups,class_='form-control')} <span class="help-block">${_('Optionally select a group to put this repository into.')}</span> </div> @@ -49,7 +49,7 @@ <div class="form-group"> <label class="control-label" for="landing_rev">${_('Landing revision')}:</label> - <div class="input"> + <div> ${h.select('landing_rev','',c.landing_revs,class_='form-control')} <span class="help-block">${_('Default revision for files page, downloads, whoosh, and readme.')}</span> </div>
--- a/kallithea/templates/login.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/login.html Sun Dec 04 22:53:36 2016 +0100 @@ -24,14 +24,14 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label col-sm-5" for="username">${_('Username')}:</label> - <div class="input col-sm-7"> + <div class="col-sm-7"> ${h.text('username',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label col-sm-5" for="password">${_('Password')}:</label> - <div class="input col-sm-7"> + <div class="col-sm-7"> ${h.password('password',class_='form-control')} </div>
--- a/kallithea/templates/password_reset.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/password_reset.html Sun Dec 04 22:53:36 2016 +0100 @@ -22,7 +22,7 @@ <div class="form-group"> <label class="control-label" for="email">${_('Email Address')}:</label> - <div class="input"> + <div> ${h.text('email')} </div> </div> @@ -30,7 +30,7 @@ %if c.captcha_active: <div class="form-group"> <label class="control-label" for="recaptcha_field">${_('Captcha')}:</label> - <div class="input"> + <div> ${h.hidden('recaptcha_field')} <div id="recaptcha"></div> </div>
--- a/kallithea/templates/password_reset_confirmation.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/password_reset_confirmation.html Sun Dec 04 22:53:36 2016 +0100 @@ -27,21 +27,21 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="token">${_('Code you received in the email')}:</label> - <div class="input"> + <div> ${h.text('token', class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="password">${_('New Password')}:</label> - <div class="input"> + <div> ${h.password('password',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="password_confirm">${_('Confirm New Password')}:</label> - <div class="input"> + <div> ${h.password('password_confirm',class_='form-control')} </div> </div>
--- a/kallithea/templates/pullrequests/pullrequest.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/pullrequests/pullrequest.html Sun Dec 04 22:53:36 2016 +0100 @@ -28,7 +28,7 @@ <div class="form-group"> <label class="control-label" for="pullrequest_title">${_('Title')}:</label> - <div class="input"> + <div> ${h.text('pullrequest_title',class_='form-control',placeholder=_('Summarize the changes - or leave empty'))} </div> </div> @@ -42,7 +42,7 @@ <div class="form-group"> <label class="control-label">${_('Changeset flow')}:</label> - <div class="input"> + <div> ##ORG <div> <div>
--- a/kallithea/templates/pullrequests/pullrequest_show.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Sun Dec 04 22:53:36 2016 +0100 @@ -40,7 +40,7 @@ <a class="btn btn-default btn-xs" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a> </div> %endif - <div class="input"> + <div> <div class="formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div> </div> </div> @@ -49,7 +49,7 @@ <div class="pr-do-edit" style="display:none"> <div> <label for="pullrequest_title">${_('Title')}:</label> - <div class="input"> + <div> ${h.text('pullrequest_title',class_='form-control',value=c.pull_request.title,placeholder=_('Summarize the changes'))} </div> </div> @@ -65,7 +65,7 @@ <div> <label>${_('Reviewer voting result')}:</label> - <div class="input"> + <div> <div class="changeset-status-container" style="float:none;clear:both"> %if c.current_voting_result: <span class="changeset-status-ico" style="padding:0px 4px 0px 0px"> @@ -82,7 +82,7 @@ </div> <div> <label>${_('Still not reviewed by')}:</label> - <div class="input"> + <div> % if len(c.pull_request_pending_reviewers) > 0: <div data-toggle="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> % elif len(c.pull_request_reviewers) > 0: @@ -94,7 +94,7 @@ </div> <div> <label>${_('Origin')}:</label> - <div class="input"> + <div> <div> ${h.link_to_ref(c.pull_request.org_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)} %if c.cs_ref_type != 'branch': @@ -105,7 +105,7 @@ </div> <div> <label>${_('Target')}:</label> - <div class="input"> + <div> %if c.is_range: ${_("This is just a range of changesets and doesn't have a target or a real merge ancestor.")} %else: @@ -116,7 +116,7 @@ </div> <div> <label>${_('Pull changes')}:</label> - <div class="input"> + <div> %if c.cs_ranges: <div> ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases? @@ -131,18 +131,18 @@ </div> <div> <label>${_('Created on')}:</label> - <div class="input"> + <div> <div>${h.fmt_date(c.pull_request.created_on)}</div> </div> </div> <div> <label>${_('Owner')}:</label> - <div class="input pr-not-edit"> + <div class="pr-not-edit"> ${h.gravatar_div(c.pull_request.owner.email, size=20)} <span>${c.pull_request.owner.full_name_and_username}</span><br/> <span><a href="mailto:${c.pull_request.owner.email}">${c.pull_request.owner.email}</a></span><br/> </div> - <div class="input pr-do-edit ac" style="display:none"> + <div class="pr-do-edit ac" style="display:none"> ${h.text('owner', class_='form-control', value=c.pull_request.owner.username, placeholder=_('Username'))} <div id="owner_completion_container"></div> </div> @@ -150,7 +150,7 @@ <div> <label>${_('Next iteration')}:</label> - <div class="input"> + <div> <div class="msg-div">${c.update_msg}</div> %if c.avail_revs: <div id="updaterevs" style="max-height:200px; overflow-y:auto; overflow-x:hidden; margin-bottom: 10px; padding: 1px 0">
--- a/kallithea/templates/register.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/register.html Sun Dec 04 22:53:36 2016 +0100 @@ -21,42 +21,42 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="username">${_('Username')}:</label> - <div class="input"> + <div> ${h.text('username',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="password">${_('Password')}:</label> - <div class="input"> + <div> ${h.password('password',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="password_confirmation">${_('Re-enter password')}:</label> - <div class="input"> + <div> ${h.password('password_confirmation',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="firstname">${_('First Name')}:</label> - <div class="input"> + <div> ${h.text('firstname',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="lastname">${_('Last Name')}:</label> - <div class="input"> + <div> ${h.text('lastname',class_='form-control')} </div> </div> <div class="form-group"> <label class="control-label" for="email">${_('Email')}:</label> - <div class="input"> + <div> ${h.text('email',class_='form-control')} </div> </div> @@ -64,7 +64,7 @@ %if c.captcha_active: <div class="form-group"> <label class="control-label" for="recaptcha_field">${_('Captcha')}:</label> - <div class="input"> + <div> ${h.hidden('recaptcha_field')} <div id="recaptcha"></div> </div>
--- a/kallithea/templates/search/search.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/search/search.html Sun Dec 04 22:53:36 2016 +0100 @@ -47,7 +47,7 @@ <div class="form-horizontal"> <div class="form-group"> <label class="control-label" for="q">${_('Search term')}:</label> - <div class="input"> + <div> ${h.text('q',c.cur_query,class_='form-control')} </div> </div>
--- a/kallithea/templates/summary/summary.html Sun Dec 04 22:53:36 2016 +0100 +++ b/kallithea/templates/summary/summary.html Sun Dec 04 22:53:36 2016 +0100 @@ -69,7 +69,7 @@ <div id="summary" class="form-horizontal"> <div class="form-group clearfix"> <label>${_('Clone URL')}:</label> - <div class="input ${summary(c.show_stats)}"> + <div class="${summary(c.show_stats)}"> ${self.repotag(c.db_repo)} <input style="width:80%" type="text" id="clone_url" readonly="readonly" value="${c.clone_repo_url}"/> <input style="display:none;width:80%" type="text" id="clone_url_id" readonly="readonly" value="${c.clone_repo_url_id}"/> @@ -80,12 +80,12 @@ <div class="form-group clearfix"> <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 class="${summary(c.show_stats)} desc">${h.urlify_text(c.db_repo.description, stylize=c.visual.stylify_metatags)}</div> </div> <div class="form-group clearfix"> <label>${_('Trending files')}:</label> - <div class="input ${summary(c.show_stats)}"> + <div class="${summary(c.show_stats)}"> %if c.show_stats: <div id="lang_stats"></div> %else: @@ -99,7 +99,7 @@ <div class="form-group clearfix"> <label>${_('Download')}:</label> - <div class="input ${summary(c.show_stats)}"> + <div class="${summary(c.show_stats)}"> %if len(c.db_repo_scm_instance.revisions) == 0: ${_('There are no downloads yet')} %elif not c.enable_downloads: