Mercurial > kallithea
changeset 6277:4304595d246c
style: in preparation for Bootstrap, refactor to use Bootstrap compatible form class names
Based on work by Dominik Ruf.
Mostly:
sed -i \
-e 's,<table>,<table class="table">,g' \
-e 's,<div class="fields">,<div class="form-horizontal">,g' \
-e 's,<div class="field">,<div class="form-group">,g' \
-e 's,<label for="\([^"]*\)">,<label class="control-label" for="\1">,g' \
`hg mani`
cat kallithea/public/css/style.css | \
sed -e '/\.fields\>/{p;s/\.fields/.form-horizontal/g}' | \
sed -e '/\.fields\>/s/ {$/,/g' | \
sed -e '/\.field\>/{p;s/\.field\>/.form-group/g}' | \
sed -e '/\.field\>/s/ {$/,/g' | \
sed -e '/\.fields\>.*\.form-group\>/d' | \
sed -e '/\.form-horizontal\>.*\.field\>/d ' | \
cat - > kallithea/public/css/style.css.tmp
mv kallithea/public/css/style.css.tmp kallithea/public/css/style.css
line wrap: on
line diff
--- a/kallithea/public/css/style.css Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/public/css/style.css Mon Oct 24 21:45:09 2016 +0200 @@ -798,7 +798,8 @@ color: #4e6100; } -#content div.panel div.form div.fields div.field { +#content div.panel div.form div.fields div.field, +#content div.panel div.form div.form-horizontal div.form-group { height: 1%; min-height: 12px; border-bottom: 1px solid #DDD; @@ -807,15 +808,18 @@ padding: 10px 0; } -#content div.panel div.form div.fields div.field-first { +#content div.panel div.form div.fields div.field-first, +#content div.panel div.form div.form-horizontal div.form-group-first { padding: 0 0 10px; } -#content div.panel div.form div.fields div.field-noborder { +#content div.panel div.form div.fields div.field-noborder, +#content div.panel div.form div.form-horizontal div.form-group-noborder { border-bottom: 0 !important; } -#content div.panel div.form div.fields div.field span.error-message { +#content div.panel div.form div.fields div.field span.error-message, +#content div.panel div.form div.form-horizontal div.form-group span.error-message { height: 1%; display: inline-block; color: red; @@ -823,7 +827,8 @@ padding: 0; } -#content div.panel div.form div.fields div.field span.success { +#content div.panel div.form div.fields div.field span.success, +#content div.panel div.form div.form-horizontal div.form-group span.success { height: 1%; display: block; color: #316309; @@ -831,7 +836,8 @@ padding: 0; } -#content div.panel div.form div.fields div.field div.label { +#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; @@ -839,7 +845,8 @@ padding: 5px 0 0 0px; } -#content div.panel div.form div.fields div.field div.label-summary { +#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; width: 155px; position: absolute; @@ -847,38 +854,47 @@ padding: 0px 0 0 0px; } -#content div.panel div.form div.fields div.field div.label-select { +#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 { 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.fields div.field div.input, +#content div.panel div.form div.form-horizontal div.form-group div.input { margin: 0 0 0 200px; } -#content div.panel div.form div.fields div.field div.input.summary { +#content div.panel div.form div.fields div.field div.input.summary, +#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.fields div.field div.input.summary-short { +#content div.panel div.form div.fields div.field div.input.summary-short, +#content div.panel div.form div.form-horizontal div.form-group div.input.summary-short { margin: 0 0 0 110px; } -#content div.panel div.form div.fields div.field div.file { +#content div.panel div.form div.fields div.field div.file, +#content div.panel div.form div.form-horizontal div.form-group div.file { margin: 0 0 0 200px; } -#content div.panel div.form div.fields div.field div.editor { +#content div.panel div.form div.fields div.field div.editor, +#content div.panel div.form div.form-horizontal div.form-group div.editor { margin: 0 0 0 200px; } #content div.panel div.form div.fields div.field div.input input, +#content div.panel div.form div.form-horizontal div.form-group div.input input, .reviewer_ac input { background: #FFF; border-top: 1px solid #b3b3b3; @@ -892,13 +908,16 @@ } #content div.panel div.form div.fields div.field div.input input#clone_url, +#content div.panel div.form div.form-horizontal div.form-group div.input input#clone_url, #content div.panel div.form div.fields div.field div.input input#clone_url_id +#content div.panel div.form div.form-horizontal div.form-group div.input input#clone_url_id { font-size: 14px; padding: 0 2px; } -#content div.panel div.form div.fields div.field div.file input { +#content div.panel div.form div.fields div.field div.file input, +#content div.panel div.form div.form-horizontal div.form-group div.file input { background: none repeat scroll 0 0 #FFFFFF; border-color: #B3B3B3 #EAEAEA #EAEAEA #B3B3B3; border-style: solid; @@ -914,23 +933,28 @@ background-color: #F5F5F5 !important; } -#content div.panel div.form div.fields div.field div.input input.small { +#content div.panel div.form div.fields div.field div.input input.small, +#content div.panel div.form div.form-horizontal div.form-group div.input input.small { width: 30%; } -#content div.panel div.form div.fields div.field div.input input.medium { +#content div.panel div.form div.fields div.field div.input input.medium, +#content div.panel div.form div.form-horizontal div.form-group div.input input.medium { width: 55%; } -#content div.panel div.form div.fields div.field div.input input.large { +#content div.panel div.form div.fields div.field div.input input.large, +#content div.panel div.form div.form-horizontal div.form-group div.input input.large { width: 85%; } -#content div.panel div.form div.fields div.field div.input input.date { +#content div.panel div.form div.fields div.field div.input input.date, +#content div.panel div.form div.form-horizontal div.form-group div.input input.date { width: 177px; } -#content div.panel div.form div.fields div.field div.input input.button { +#content div.panel div.form div.fields div.field div.input input.button, +#content div.panel div.form div.form-horizontal div.form-group div.input input.button { background: #D4D0C8; border-top: 1px solid #FFF; border-left: 1px solid #FFF; @@ -941,7 +965,8 @@ padding: 4px 8px; } -#content div.panel div.form div.fields div.field div.textarea { +#content div.panel div.form div.fields div.field div.textarea, +#content div.panel div.form div.form-horizontal div.form-group div.textarea { border-top: 1px solid #b3b3b3; border-left: 1px solid #b3b3b3; border-right: 1px solid #eaeaea; @@ -950,12 +975,14 @@ padding: 7px 7px 6px; } -#content div.panel div.form div.fields div.field div.textarea-editor { +#content div.panel div.form div.fields div.field div.textarea-editor, +#content div.panel div.form div.form-horizontal div.form-group div.textarea-editor { border: 1px solid #ddd; padding: 0; } -#content div.panel div.form div.fields div.field div.textarea textarea { +#content div.panel div.form div.fields div.field div.textarea textarea, +#content div.panel div.form div.form-horizontal div.form-group div.textarea textarea { width: 100%; height: 220px; overflow-y: auto; @@ -968,36 +995,45 @@ padding: 0; } -#content div.panel div.form div.fields div.field div.textarea table { +#content div.panel div.form div.fields div.field div.textarea table, +#content div.panel div.form div.form-horizontal div.form-group div.textarea table { width: 100%; border: none; margin: 0; padding: 0; } -#content div.panel div.form div.fields div.field div.textarea table td { +#content div.panel div.form div.fields div.field div.textarea table td, +#content div.panel div.form div.form-horizontal div.form-group div.textarea table td { background: #DDD; border: none; padding: 0; } -#content div.panel div.form div.fields div.field div.textarea table td table { +#content div.panel div.form div.fields div.field div.textarea table td table, +#content div.panel div.form div.form-horizontal div.form-group div.textarea table td table { width: auto; border: none; margin: 0; padding: 0; } -#content div.panel div.form div.fields div.field div.textarea table td table td { +#content div.panel div.form div.fields div.field div.textarea table td table td, +#content div.panel div.form div.form-horizontal div.form-group div.textarea table td table td { font-size: 11px; padding: 5px 5px 5px 0; } #content div.panel div.form div.fields div.field input[type=text]:focus, +#content div.panel div.form div.form-horizontal div.form-group input[type=text]:focus, #content div.panel div.form div.fields div.field input[type=password]:focus, +#content div.panel div.form div.form-horizontal div.form-group input[type=password]:focus, #content div.panel div.form div.fields div.field input[type=file]:focus, +#content div.panel div.form div.form-horizontal div.form-group input[type=file]:focus, #content div.panel div.form div.fields div.field textarea:focus, +#content div.panel div.form div.form-horizontal div.form-group textarea:focus, #content div.panel div.form div.fields div.field select:focus, +#content div.panel div.form div.form-horizontal div.form-group select:focus, .reviewer_ac input:focus { background: #f6f6f6; border-color: #666; @@ -1007,7 +1043,8 @@ padding: 10px } -div.form div.fields div.field div.button { +div.form div.fields div.field div.button, +div.form div.form-horizontal div.form-group div.button { margin: 0; padding: 0 0 0 8px; } @@ -1610,21 +1647,25 @@ #quick_login .links .logout { } -#quick_login div.form div.fields { +#quick_login div.form div.fields, +#quick_login div.form div.form-horizontal { padding-top: 2px; padding-left: 10px; } -#quick_login div.form div.fields div.field { +#quick_login div.form div.fields div.field, +#quick_login div.form div.form-horizontal div.form-group { padding: 5px; } -#quick_login div.form div.fields div.field div.label label { +#quick_login div.form div.fields div.field div.label label, +#quick_login div.form div.form-horizontal div.form-group div.label label { color: #fff; padding-bottom: 3px; } -#quick_login div.form div.fields div.field div.input input { +#quick_login div.form div.fields div.field div.input input, +#quick_login div.form div.form-horizontal div.form-group div.input input { width: 236px; background: #FFF; border-top: 1px solid #b3b3b3; @@ -1637,7 +1678,8 @@ padding: 5px 7px 4px; } -#quick_login div.form div.fields div.buttons { +#quick_login div.form div.fields div.buttons, +#quick_login div.form div.form-horizontal div.buttons { clear: both; overflow: hidden; text-align: right; @@ -1695,7 +1737,8 @@ padding: 20px; } -#register div.form div.fields div.field div.label { +#register div.form div.fields div.field div.label, +#register div.form div.form-horizontal div.form-group div.label { width: 135px; float: left; text-align: right; @@ -1703,7 +1746,8 @@ padding: 5px 0 0 5px; } -#register div.form div.fields div.field div.input input { +#register div.form div.fields div.field div.input input, +#register div.form div.form-horizontal div.form-group div.input input { width: 300px; background: #FFF; border-top: 1px solid #b3b3b3; @@ -1716,7 +1760,8 @@ padding: 7px 7px 6px; } -#register div.form div.fields div.buttons { +#register div.form div.fields div.buttons, +#register div.form div.form-horizontal div.buttons { clear: both; overflow: hidden; border-top: 1px solid #DDD; @@ -3197,6 +3242,7 @@ img, #header #header-inner #quick li a:hover span.normal, #content div.panel div.form div.fields div.field div.textarea table td table td a, +#content div.panel div.form div.form-horizontal div.form-group div.textarea table td table td a, #clone_url, #clone_url_id { @@ -3295,10 +3341,12 @@ } #content div.panel div.form div.fields, +#content div.panel div.form div.form-horizontal, #login div.form-horizontal, #login div.form-horizontal div.form-group, #register div.form, -#register div.form div.fields { +#register div.form div.fields, +#register div.form div.form-horizontal { clear: both; overflow: hidden; margin: 0; @@ -3306,8 +3354,10 @@ } #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.fields div.field div.label span, +#register div.form div.form-horizontal div.form-group div.label span { height: 1%; display: block; color: #363636; @@ -3316,8 +3366,10 @@ } #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, -#register div.form div.fields div.field div.input input.error { +#register div.form div.fields div.field div.input input.error, +#register div.form div.form-horizontal div.form-group div.input input.error { background: #FBE3E4; border-top: 1px solid #e1b2b3; border-left: 1px solid #e1b2b3; @@ -3326,8 +3378,10 @@ } #content div.panel div.form div.fields div.field div.input input.success, +#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.fields div.field div.input input.success { +#register div.form div.fields div.field div.input input.success, +#register div.form div.form-horizontal div.form-group div.input input.success { background: #E6EFC2; border-top: 1px solid #cebb98; border-left: 1px solid #cebb98; @@ -3336,32 +3390,41 @@ } #content div.panel div.form div.fields div.field div.select select, +#content div.panel div.form div.form-horizontal div.form-group div.select select, #content div.panel table th.selected input, #content div.panel table td.selected input { margin: 0; } #content div.panel div.form div.fields div.field div.select, +#content div.panel div.form div.form-horizontal div.form-group div.select, #content div.panel div.form div.fields div.field div.checkboxes, -#content div.panel div.form div.fields div.field div.radios { +#content div.panel div.form div.form-horizontal div.form-group div.checkboxes, +#content div.panel div.form div.fields div.field div.radios, +#content div.panel div.form div.form-horizontal div.form-group div.radios { margin: 0 0 0 200px; padding: 0; } #content div.panel div.form div.fields div.field div.select a:hover, +#content div.panel div.form div.form-horizontal div.form-group div.select a:hover, #content div.panel div.form div.fields div.field div.select a.ui-selectmenu:hover, +#content div.panel div.form div.form-horizontal div.form-group div.select a.ui-selectmenu:hover, #content div.panel div.action a:hover { color: #000; text-decoration: none; } #content div.panel div.form div.fields div.field div.select a.ui-selectmenu-focus, +#content div.panel div.form div.form-horizontal div.form-group div.select a.ui-selectmenu-focus, #content div.panel div.action a.ui-selectmenu-focus { border: 1px solid #666; } #content div.panel div.form div.fields div.field div.checkboxes div.checkbox, -#content div.panel div.form div.fields div.field div.radios div.radio { +#content div.panel div.form div.form-horizontal div.form-group div.checkboxes div.checkbox, +#content div.panel div.form div.fields div.field div.radios div.radio, +#content div.panel div.form div.form-horizontal div.form-group div.radios div.radio { clear: both; overflow: hidden; margin: 0; @@ -3369,13 +3432,17 @@ } #content div.panel div.form div.fields div.field div.checkboxes div.checkbox input, -#content div.panel div.form div.fields div.field div.radios div.radio input { +#content div.panel div.form div.form-horizontal div.form-group div.checkboxes div.checkbox input, +#content div.panel div.form div.fields div.field div.radios div.radio input, +#content div.panel div.form div.form-horizontal div.form-group div.radios div.radio input { float: left; margin: 0; } #content div.panel div.form div.fields div.field div.checkboxes div.checkbox label, -#content div.panel div.form div.fields div.field div.radios div.radio label { +#content div.panel div.form div.form-horizontal div.form-group div.checkboxes div.checkbox label, +#content div.panel div.form div.fields div.field div.radios div.radio label, +#content div.panel div.form div.form-horizontal div.form-group div.radios div.radio label { height: 1%; display: block; float: left; @@ -3383,8 +3450,11 @@ } div.form div.fields div.field div.button input, +div.form div.form-horizontal div.form-group div.button input, #content div.panel div.form div.fields div.buttons input +#content div.panel div.form div.form-horizontal div.buttons input div.form div.fields div.buttons input, +div.form div.form-horizontal div.buttons input, #content div.panel div.action div.button input { font-size: 11px; font-weight: 700; @@ -3392,12 +3462,16 @@ } div.form div.fields div.field div.highlight, -#content div.panel div.form div.fields div.buttons div.highlight { +div.form div.form-horizontal div.form-group div.highlight, +#content div.panel div.form div.fields div.buttons div.highlight, +#content div.panel div.form div.form-horizontal div.buttons div.highlight { display: inline; } #content div.panel div.form div.fields div.buttons, -div.form div.fields div.buttons { +#content div.panel div.form div.form-horizontal div.buttons, +div.form div.fields div.buttons, +div.form div.form-horizontal div.buttons { margin: 10px 0 0 200px; padding: 0; } @@ -3410,7 +3484,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.fields div.field div.input div.link { +#register div.form div.fields div.field div.input div.link, +#register div.form div.form-horizontal div.form-group div.input div.link { text-align: right; margin: 6px 0 0; padding: 0; @@ -3479,7 +3554,8 @@ } #login div.form div.form-horizontal div.form-group, -#register div.form div.fields div.field { +#register div.form div.fields div.field, +#register div.form div.form-horizontal div.form-group { clear: both; overflow: hidden; margin: 0; @@ -3487,7 +3563,8 @@ } #login div.form div.form-horizontal div.form-group span.error-message, -#register div.form div.fields div.field span.error-message { +#register div.form div.fields div.field span.error-message, +#register div.form div.form-horizontal div.form-group span.error-message { height: 1%; display: block; color: red; @@ -3497,13 +3574,15 @@ } #login div.form div.form-horizontal div.form-group label, -#register div.form div.fields div.field div.label label { +#register div.form div.fields div.field div.label label, +#register div.form div.form-horizontal div.form-group div.label label { color: #000; font-weight: 700; } #login div.form div.form-horizontal div.form-group div, -#register div.form div.fields div.field div.input { +#register div.form div.fields div.field div.input, +#register div.form div.form-horizontal div.form-group div.input { float: left; margin: 0; padding: 0; @@ -3514,19 +3593,22 @@ } #login div.form div.form-horizontal div.form-group div.checkbox, -#register div.form div.fields div.field div.checkbox { +#register div.form div.fields div.field div.checkbox, +#register div.form div.form-horizontal div.form-group div.checkbox { margin: 0 0 0 184px; padding: 0; } #login div.form div.form-horizontal div.form-group div.checkbox label, -#register div.form div.fields div.field div.checkbox label { +#register div.form div.fields div.field div.checkbox label, +#register div.form div.form-horizontal div.form-group div.checkbox label { color: #565656; font-weight: 700; } #login div.form div.buttons input, -#register div.form div.fields div.buttons input { +#register div.form div.fields div.buttons input, +#register div.form div.form-horizontal div.buttons input { color: #000; font-size: 1em; font-weight: 700;
--- a/kallithea/templates/admin/admin_log.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/admin_log.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- %if c.users_log: -<table> +<table class="table"> <tr> <th class="left">${_('Username')}</th> <th class="left">${_('Action')}</th>
--- a/kallithea/templates/admin/auth/auth_settings.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/auth/auth_settings.html Mon Oct 24 21:45:09 2016 +0200 @@ -26,9 +26,9 @@ ## enabled auth plugins <h1>${_('Authentication Plugins')}</h1> - <div class="fields"> - <div class="field"> - <div class="label"><label for="auth_plugins">${_("Enabled Plugins")}</label></div> + <div class="form-horizontal"> + <div class="form-group"> + <div class="label"><label class="control-label" for="auth_plugins">${_("Enabled Plugins")}</label></div> <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> @@ -49,46 +49,46 @@ %for cnt, module in enumerate(c.enabled_plugins): <% pluginName = c.plugin_shortnames[module] %> <h1>${_('Plugin')}: ${pluginName}</h1> - <div class="fields"> + <div class="form-horizontal"> ## autoform generation, based on plugin definition from it's settings %for setting in c.plugin_settings[module]: <% fullsetting = "auth_%s_%s" % (pluginName, setting["name"]) %> <% displayname = (setting["formname"] if ("formname" in setting) else setting["name"]) %> %if setting["type"] == "password": - <div class="field"> - <div class="label"><label for="${fullsetting}">${_(displayname)}</label></div> + <div class="form-group"> + <div class="label"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div> <div class="input"> ${h.password(fullsetting,class_='small')} <span class="help-block">${setting["description"]}</span> </div> </div> %elif setting["type"] in ["string", "int"]: - <div class="field"> - <div class="label"><label for="${fullsetting}">${_(displayname)}</label></div> + <div class="form-group"> + <div class="label"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div> <div class="input"> ${h.text(fullsetting,class_='small')} <span class="help-block">${setting["description"]}</span> </div> </div> %elif setting["type"] == "bool": - <div class="field"> - <div class="label label-checkbox"><label for="${fullsetting}">${_(displayname)}</label></div> + <div class="form-group"> + <div class="label label-checkbox"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div> <div class="checkboxes"> <div class="checkbox">${h.checkbox(fullsetting,True,class_='small')}</div> <span class="help-block">${setting["description"]}</span> </div> </div> %elif setting["type"] == "select": - <div class="field"> - <div class="label"><label for="${fullsetting}">${_(displayname)}</label></div> + <div class="form-group"> + <div class="label"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div> <div class="select"> ${h.select(fullsetting,setting['values'][0],setting['values'],class_='small')} <span class="help-block">${setting["description"]}</span> </div> </div> %else: - <div class="field"> - <div class="label"><label for="${fullsetting}">${_(displayname)}</label></div> + <div class="form-group"> + <div class="label"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div> <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> @@ -96,7 +96,7 @@ %endfor </div> %endfor - <div class="fields"> + <div class="form-horizontal"> <div class="buttons"> ${h.submit('save',_('Save'),class_="btn btn-default")} </div>
--- a/kallithea/templates/admin/defaults/defaults.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/defaults/defaults.html Mon Oct 24 21:45:09 2016 +0200 @@ -26,20 +26,20 @@ <div class="form"> <!-- fields --> - <div class="fields"> + <div class="form-horizontal"> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="default_repo_type">${_('Type')}:</label> + <label class="control-label" for="default_repo_type">${_('Type')}:</label> </div> <div class="input"> ${h.select('default_repo_type','hg',c.backends,class_="medium")} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="default_repo_private">${_('Private repository')}:</label> + <label class="control-label" for="default_repo_private">${_('Private repository')}:</label> </div> <div class="checkboxes"> ${h.checkbox('default_repo_private',value="True")} @@ -48,9 +48,9 @@ </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="default_repo_enable_statistics">${_('Enable statistics')}:</label> + <label class="control-label" for="default_repo_enable_statistics">${_('Enable statistics')}:</label> </div> <div class="checkboxes"> ${h.checkbox('default_repo_enable_statistics',value="True")} @@ -58,9 +58,9 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="default_repo_enable_downloads">${_('Enable downloads')}:</label> + <label class="control-label" for="default_repo_enable_downloads">${_('Enable downloads')}:</label> </div> <div class="checkboxes"> ${h.checkbox('default_repo_enable_downloads',value="True")} @@ -68,9 +68,9 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="default_repo_enable_locking">${_('Enable locking')}:</label> + <label class="control-label" for="default_repo_enable_locking">${_('Enable locking')}:</label> </div> <div class="checkboxes"> ${h.checkbox('default_repo_enable_locking',value="True")}
--- a/kallithea/templates/admin/my_account/my_account_api_keys.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_api_keys.html Mon Oct 24 21:45:09 2016 +0200 @@ -55,8 +55,8 @@ ${h.form(url('my_account_api_keys'), method='post')} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> <label for="description">${_('New API key')}:</label> </div>
--- a/kallithea/templates/admin/my_account/my_account_emails.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_emails.html Mon Oct 24 21:45:09 2016 +0200 @@ -36,10 +36,10 @@ ${h.form(url('my_account_emails'), method='post')} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="new_email">${_('New email address')}:</label> + <label class="control-label" for="new_email">${_('New email address')}:</label> </div> <div class="input"> ${h.text('new_email', class_='medium')}
--- a/kallithea/templates/admin/my_account/my_account_password.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_password.html Mon Oct 24 21:45:09 2016 +0200 @@ -4,28 +4,28 @@ ${h.form(url('my_account_password'), method='post')} <div class="form"> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="current_password">${_('Current password')}:</label> + <label class="control-label" for="current_password">${_('Current password')}:</label> </div> <div class="input"> ${h.password('current_password',class_='medium')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="new_password">${_('New password')}:</label> + <label class="control-label" for="new_password">${_('New password')}:</label> </div> <div class="input"> ${h.password('new_password',class_='medium')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="new_password_confirmation">${_('Confirm new password')}:</label> + <label class="control-label" for="new_password_confirmation">${_('Confirm new password')}:</label> </div> <div class="input"> ${h.password('new_password_confirmation',class_='medium')}
--- a/kallithea/templates/admin/my_account/my_account_profile.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/my_account/my_account_profile.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,7 +1,7 @@ ${h.form(url('my_account'), method='post')} <div class="form"> - <div class="field"> + <div class="form-group"> <div class="gravatar_box"> ${h.gravatar_div(c.user.email)} <p> @@ -17,37 +17,37 @@ </div> </div> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="username">${_('Username')}:</label> + <label class="control-label" for="username">${_('Username')}:</label> </div> <div class="input"> ${h.text('username',class_='medium', readonly=c.readonly('username'))} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="name">${_('First Name')}:</label> + <label class="control-label" for="name">${_('First Name')}:</label> </div> <div class="input"> ${h.text('firstname',class_="medium", readonly=c.readonly('firstname'))} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="lastname">${_('Last Name')}:</label> + <label class="control-label" for="lastname">${_('Last Name')}:</label> </div> <div class="input"> ${h.text('lastname',class_="medium", readonly=c.readonly('lastname'))} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="email">${_('Email')}:</label> + <label class="control-label" for="email">${_('Email')}:</label> </div> <div class="input"> ${h.text('email',class_="medium", readonly=c.readonly('email'))}
--- a/kallithea/templates/admin/permissions/permissions_globals.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/permissions/permissions_globals.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,10 +1,10 @@ ${h.form(url('admin_permissions'), method='post')} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="anonymous">${_('Anonymous access')}:</label> + <label class="control-label" for="anonymous">${_('Anonymous access')}:</label> </div> <div class="checkboxes"> <div class="checkbox"> @@ -13,9 +13,9 @@ <span class="help-block">${h.literal(_('Allow access to Kallithea without needing to log in. Anonymous users use %s user permissions.' % (h.link_to('*default*',h.url('admin_permissions_perms')))))}</span> </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="default_repo_perm">${_('Repository')}:</label> + <label class="control-label" for="default_repo_perm">${_('Repository')}:</label> </div> <div class="select"> ${h.select('default_repo_perm','',c.repo_perms_choices)} @@ -27,9 +27,9 @@ <span class="help-block">${_('Permissions for the Default user on new repositories.')}</span> </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="default_group_perm">${_('Repository group')}:</label> + <label class="control-label" for="default_group_perm">${_('Repository group')}:</label> </div> <div class="select"> ${h.select('default_group_perm','',c.group_perms_choices)} @@ -41,9 +41,9 @@ <span class="help-block">${_('Permissions for the Default user on new repository groups.')}</span> </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="default_group_perm">${_('User group')}:</label> + <label class="control-label" for="default_group_perm">${_('User group')}:</label> </div> <div class="select"> ${h.select('default_user_group_perm','',c.user_group_perms_choices)} @@ -55,9 +55,9 @@ <span class="help-block">${_('Permissions for the Default user on new user groups.')}</span> </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="default_repo_create">${_('Top level repository creation')}:</label> + <label class="control-label" for="default_repo_create">${_('Top level repository creation')}:</label> </div> <div class="select"> ${h.select('default_repo_create','',c.repo_create_choices)} @@ -65,44 +65,44 @@ <span class="help-block">${_('Note: This will also give all users API access to create repositories everywhere. That might change in future versions.')}</span> </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="create_on_write">${_('Repository creation with group write access')}:</label> + <label class="control-label" for="create_on_write">${_('Repository creation with group write access')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label"> - <label for="default_user_group_create">${_('User group creation')}:</label> + <label class="control-label" for="default_user_group_create">${_('User group creation')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label"> - <label for="default_fork">${_('Repository forking')}:</label> + <label class="control-label" for="default_fork">${_('Repository forking')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label"> - <label for="default_register">${_('Registration')}:</label> + <label class="control-label" for="default_register">${_('Registration')}:</label> </div> <div class="select"> ${h.select('default_register','',c.register_choices)} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="default_extern_activate">${_('External auth account activation')}:</label> + <label class="control-label" for="default_extern_activate">${_('External auth account activation')}:</label> </div> <div class="select"> ${h.select('default_extern_activate','',c.extern_activate_choices)}
--- a/kallithea/templates/admin/permissions/permissions_ips.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/permissions/permissions_ips.html Mon Oct 24 21:45:09 2016 +0200 @@ -24,10 +24,10 @@ ${h.form(url('edit_user_ips_update', id=c.user.user_id))} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="new_ip">${_('New IP address')}:</label> + <label class="control-label" for="new_ip">${_('New IP address')}:</label> </div> <div class="input"> ${h.hidden('default_user', 'True')}
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Mon Oct 24 21:45:09 2016 +0200 @@ -27,28 +27,28 @@ ${h.form(url('repos_groups'))} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="group_name">${_('Group name')}:</label> + <label class="control-label" for="group_name">${_('Group name')}:</label> </div> <div class="input"> ${h.text('group_name',class_='small')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-textarea"> - <label for="group_description">${_('Description')}:</label> + <label class="control-label" for="group_description">${_('Description')}:</label> </div> <div class="textarea-repo editor"> ${h.textarea('group_description',cols=23,rows=5,class_="medium")} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="group_parent_id">${_('Group parent')}:</label> + <label class="control-label" for="group_parent_id">${_('Group parent')}:</label> </div> <div class="input"> ${h.select('group_parent_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")} @@ -57,7 +57,7 @@ <div id="copy_perms" class="field"> <div class="label label-checkbox"> - <label for="group_copy_permissions">${_('Copy parent group permissions')}:</label> + <label class="control-label" for="group_copy_permissions">${_('Copy parent group permissions')}:</label> </div> <div class="checkboxes"> ${h.checkbox('group_copy_permissions',value="True")}
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Mon Oct 24 21:45:09 2016 +0200 @@ -2,36 +2,36 @@ ${h.form(url('update_repos_group',group_name=c.repo_group.group_name))} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="group_name">${_('Group name')}:</label> + <label class="control-label" for="group_name">${_('Group name')}:</label> </div> <div class="input"> ${h.text('group_name',class_='medium')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-textarea"> - <label for="group_description">${_('Description')}:</label> + <label class="control-label" for="group_description">${_('Description')}:</label> </div> <div class="textarea text-area editor"> ${h.textarea('group_description',cols=23,rows=5,class_="medium")} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="group_parent_id">${_('Group parent')}:</label> + <label class="control-label" for="group_parent_id">${_('Group parent')}:</label> </div> <div class="input"> ${h.select('group_parent_id','',c.repo_groups,class_="medium")} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="enable_locking">${_('Enable locking')}:</label> + <label class="control-label" for="enable_locking">${_('Enable locking')}:</label> </div> <div class="checkboxes"> ${h.checkbox('enable_locking',value="True")} @@ -48,8 +48,8 @@ ${h.form(url('delete_repo_group', group_name=c.repo_group.group_name))} <div class="form"> - <div class="fields"> - <div class="field" style="border:none;color:#888"> + <div class="form-horizontal"> + <div class="buttons"> ${h.submit('remove_%s' % c.repo_group.group_name,_('Remove this group'),class_="btn red",onclick="return confirm('"+_('Confirm to delete this group')+"');")} </div> </div>
--- a/kallithea/templates/admin/repos/repo_add_base.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_add_base.html Mon Oct 24 21:45:09 2016 +0200 @@ -3,10 +3,10 @@ ${h.form(url('repos'))} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="repo_name">${_('Name')}:</label> + <label class="control-label" for="repo_name">${_('Name')}:</label> </div> <div class="input"> ${h.text('repo_name',class_="small")} @@ -14,7 +14,7 @@ </div> <div id="remote_clone" class="field"> <div class="label"> - <label for="clone_uri">${_('Clone remote repository')}:</label> + <label class="control-label" for="clone_uri">${_('Clone remote repository')}:</label> </div> <div class="input"> ${h.text('clone_uri',class_="small")} @@ -23,18 +23,18 @@ </span> </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-textarea"> - <label for="repo_description">${_('Description')}:</label> + <label class="control-label" for="repo_description">${_('Description')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label"> - <label for="repo_group">${_('Repository group')}:</label> + <label class="control-label" for="repo_group">${_('Repository group')}:</label> </div> <div class="input"> ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")} @@ -43,34 +43,34 @@ </div> <div id="copy_perms" class="field"> <div class="label label-checkbox"> - <label for="repo_copy_permissions">${_('Copy parent group permissions')}:</label> + <label class="control-label" for="repo_copy_permissions">${_('Copy parent group permissions')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label"> - <label for="repo_type">${_('Type')}:</label> + <label class="control-label" for="repo_type">${_('Type')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label"> - <label for="repo_landing_rev">${_('Landing revision')}:</label> + <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="repo_private">${_('Private repository')}:</label> + <label class="control-label" for="repo_private">${_('Private repository')}:</label> </div> <div class="checkboxes"> ${h.checkbox('repo_private',value="True")}
--- a/kallithea/templates/admin/repos/repo_edit_caches.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_caches.html Mon Oct 24 21:45:09 2016 +0200 @@ -10,7 +10,7 @@ </div> <div class="field" style="border:none;"> ${_('List of Cached Values')} - <table> + <table class="table"> <tr> <th>${_('Prefix')}</th> <th>${_('Key')}</th>
--- a/kallithea/templates/admin/repos/repo_edit_fields.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_fields.html Mon Oct 24 21:45:09 2016 +0200 @@ -27,27 +27,27 @@ ${h.form(url('create_repo_fields', repo_name=c.repo_name))} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="new_field_key">${_('New field key')}:</label> + <label class="control-label" for="new_field_key">${_('New field key')}:</label> </div> <div class="input"> ${h.text('new_field_key', class_='small')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="new_field_label">${_('New field label')}:</label> + <label class="control-label" for="new_field_label">${_('New field label')}:</label> </div> <div class="input"> ${h.text('new_field_label', class_='small', placeholder=_('Enter short label'))} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="new_field_desc">${_('New field description')}:</label> + <label class="control-label" for="new_field_desc">${_('New field description')}:</label> </div> <div class="input"> ${h.text('new_field_desc', class_='small', placeholder=_('Enter description of a field'))}
--- a/kallithea/templates/admin/repos/repo_edit_permissions.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_permissions.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,7 +1,7 @@ ${h.form(url('edit_repo_perms_update', repo_name=c.repo_name))} <div class="form"> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> ${h.hidden('repo_private')} <table id="permissions_manage" class="noborder"> <tr>
--- a/kallithea/templates/admin/repos/repo_edit_settings.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_settings.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,10 +1,10 @@ ${h.form(url('update_repo', repo_name=c.repo_info.repo_name))} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="repo_name">${_('Name')}:</label> + <label class="control-label" for="repo_name">${_('Name')}:</label> </div> <div class="input"> ${h.text('repo_name',class_="medium")} @@ -16,9 +16,9 @@ This is useful for CI systems, or any other cases that you need to hardcode the URL into a 3rd party service.''')}</span> </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="clone_uri">${_('Remote repository')}:</label> + <label class="control-label" for="clone_uri">${_('Remote repository')}:</label> </div> <div class="input"> <div id="alter_clone_uri"> @@ -30,27 +30,27 @@ </span> </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="repo_group">${_('Repository group')}:</label> + <label class="control-label" for="repo_group">${_('Repository group')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label"> - <label for="repo_landing_rev">${_('Landing revision')}:</label> + <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label"> - <label for="owner">${_('Owner')}:</label> + <label class="control-label" for="owner">${_('Owner')}:</label> </div> <div class="input input-medium ac"> <div class="perm_ac"> @@ -60,9 +60,9 @@ </div> </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-textarea"> - <label for="repo_description">${_('Description')}:</label> + <label class="control-label" for="repo_description">${_('Description')}:</label> </div> <div class="textarea text-area editor"> ${h.textarea('repo_description', style="height:165px")} @@ -70,36 +70,36 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="repo_private">${_('Private repository')}:</label> + <label class="control-label" for="repo_private">${_('Private repository')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="repo_enable_statistics">${_('Enable statistics')}:</label> + <label class="control-label" for="repo_enable_statistics">${_('Enable statistics')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="repo_enable_downloads">${_('Enable downloads')}:</label> + <label class="control-label" for="repo_enable_downloads">${_('Enable downloads')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="repo_enable_locking">${_('Enable locking')}:</label> + <label class="control-label" for="repo_enable_locking">${_('Enable locking')}:</label> </div> <div class="checkboxes"> ${h.checkbox('repo_enable_locking',value="True")} @@ -110,9 +110,9 @@ %if c.visual.repository_fields: ## EXTRA FIELDS %for field in c.repo_fields: - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label> + <label class="control-label" for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label> </div> <div class="input input-medium"> ${h.text(field.field_key_prefixed, field.field_value, class_='medium')}
--- a/kallithea/templates/admin/repos/repo_edit_statistics.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/repos/repo_edit_statistics.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,6 +1,6 @@ ${h.form(url('edit_repo_statistics_update', repo_name=c.repo_info.repo_name))} <div class="form"> - <div class="fields"> + <div class="form-horizontal"> <div class="field" style="border:none;color:#888"> <ul> <li>${_('Processed commits')}: ${c.stats_revision}/${c.repo_last_rev}</li>
--- a/kallithea/templates/admin/settings/settings_email.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_email.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,10 +1,10 @@ ${h.form(url('admin_settings_email'), method='post')} <div class="form"> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="test_email">${_('Send test email to')}:</label> + <label class="control-label" for="test_email">${_('Send test email to')}:</label> </div> <div class="input"> ${h.text('test_email',size=30)}
--- a/kallithea/templates/admin/settings/settings_global.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_global.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,11 +1,11 @@ ${h.form(url('admin_settings_global'), method='post')} <div class="form"> - <div class="fields"> + <div class="form-horizontal"> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="title">${_('Site branding')}:</label> + <label class="control-label" for="title">${_('Site branding')}:</label> </div> <div class="input"> ${h.text('title',size=30)} @@ -13,18 +13,18 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="realm">${_('HTTP authentication realm')}:</label> + <label class="control-label" for="realm">${_('HTTP authentication realm')}:</label> </div> <div class="input"> ${h.text('realm',size=30)} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="ga_code">${_('HTML/JavaScript/CSS customization block')}:</label> + <label class="control-label" for="ga_code">${_('HTML/JavaScript/CSS customization block')}:</label> </div> <div class="input"> ${h.textarea('ga_code', cols=80, rows=10)} @@ -37,9 +37,9 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="captcha_public_key">${_('ReCaptcha public key')}:</label> + <label class="control-label" for="captcha_public_key">${_('ReCaptcha public key')}:</label> </div> <div class="input"> ${h.text('captcha_public_key',size=60)} @@ -47,9 +47,9 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="captcha_private_key">${_('ReCaptcha private key')}:</label> + <label class="control-label" for="captcha_private_key">${_('ReCaptcha private key')}:</label> </div> <div class="input"> ${h.text('captcha_private_key',size=60)}
--- a/kallithea/templates/admin/settings/settings_hooks.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_hooks.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,10 +1,10 @@ <h4>${_('Built-in Mercurial Hooks (Read-Only)')}</h4> <div class="form"> - <div class="fields"> + <div class="form-horizontal"> % for hook in c.hooks: - <div class="field"> + <div class="form-group"> <div class="label label"> - <label for="${hook.ui_key}">${hook.ui_key}</label> + <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label> </div> <div class="input" style="margin-left:280px"> ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")} @@ -19,12 +19,12 @@ <h4>${_('Custom Hooks')}</h4> ${h.form(url('admin_settings_hooks'), method='post')} <div class="form"> - <div class="fields"> + <div class="form-horizontal"> % for hook in c.custom_hooks: <div class="field" id="${'id%s' % hook.ui_id }"> <div class="label label"> - <label for="${hook.ui_key}">${hook.ui_key}</label> + <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label> </div> <div class="input" style="margin-left:280px"> ${h.hidden('hook_ui_key',hook.ui_key)} @@ -39,7 +39,7 @@ </div> % endfor - <div class="field"> + <div class="form-group"> <div class="input" style="margin-left:-135px;position: absolute;"> <div class="input"> ${h.text('new_hook_ui_key',size=20)}
--- a/kallithea/templates/admin/settings/settings_mapping.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_mapping.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,9 +1,9 @@ ${h.form(url('admin_settings_mapping'), method='post')} <div class="form"> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="destroy">${_('Rescan option')}:</label> + <label class="control-label" for="destroy">${_('Rescan option')}:</label> </div> <div class="checkboxes"> <div class="checkbox">
--- a/kallithea/templates/admin/settings/settings_search.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_search.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,16 +1,15 @@ ${h.form(url('admin_settings_search'), method='post')} <div class="form"> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label label-checkbox"> - <label>${_('Index build option')}:</label> + <label class="control-label">${_('Index build option')}:</label> </div> <div class="checkboxes"> <div class="checkbox"> ${h.checkbox('full_index',True)} <label for="full_index">${_('Build from scratch')}</label> - </div> <span class="help-block">${_('This option completely reindexeses all of the repositories for proper fulltext search capabilities.')}</span>
--- a/kallithea/templates/admin/settings/settings_vcs.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_vcs.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,7 +1,7 @@ ${h.form(url('admin_settings'), method='post')} <div class="form"> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label label-checkbox"> <label>${_('Hooks')}:</label> </div> @@ -24,7 +24,7 @@ </div> </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> <label>${_('Mercurial extensions')}:</label> </div> @@ -46,9 +46,9 @@ </div> </div> %if c.visual.allow_repo_location_change: - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="paths_root_path">${_('Location of repositories')}:</label> + <label class="control-label" for="paths_root_path">${_('Location of repositories')}:</label> </div> <div class="input"> ${h.text('paths_root_path',size=60,readonly="readonly")}
--- a/kallithea/templates/admin/settings/settings_visual.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/settings/settings_visual.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,9 +1,9 @@ ${h.form(url('admin_settings_visual'), method='post')} <div class="form"> - <div class="fields"> + <div class="form-horizontal"> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> <label>${_('General')}:</label> </div> @@ -53,9 +53,9 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="dashboard_items">${_('Dashboard items')}:</label> + <label class="control-label" for="dashboard_items">${_('Dashboard items')}:</label> </div> <div class="input"> ${h.text('dashboard_items',size=5)} @@ -63,9 +63,9 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="admin_grid_items">${_('Admin pages items')}:</label> + <label class="control-label" for="admin_grid_items">${_('Admin pages items')}:</label> </div> <div class="input"> ${h.text('admin_grid_items',size=5)} @@ -73,7 +73,7 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> <label>${_('Icons')}:</label> </div> @@ -90,7 +90,7 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> <label>${_('Meta Tagging')}:</label> </div>
--- a/kallithea/templates/admin/user_groups/user_group_add.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_add.html Mon Oct 24 21:45:09 2016 +0200 @@ -26,27 +26,27 @@ ${h.form(url('users_groups'))} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="users_group_name">${_('Group name')}:</label> + <label class="control-label" for="users_group_name">${_('Group name')}:</label> </div> <div class="input"> ${h.text('users_group_name',class_='small')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-textarea"> - <label for="user_group_description">${_('Description')}:</label> + <label class="control-label" for="user_group_description">${_('Description')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="users_group_active">${_('Active')}:</label> + <label class="control-label" for="users_group_active">${_('Active')}:</label> </div> <div class="checkboxes"> ${h.checkbox('users_group_active',value=True, checked='checked')}
--- a/kallithea/templates/admin/user_groups/user_group_edit_settings.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/user_groups/user_group_edit_settings.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,38 +1,38 @@ ${h.form(url('update_users_group', id=c.user_group.users_group_id), id='edit_users_group')} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="users_group_name">${_('Group name')}:</label> + <label class="control-label" for="users_group_name">${_('Group name')}:</label> </div> <div class="input"> ${h.text('users_group_name',class_='large')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-textarea"> - <label for="user_group_description">${_('Description')}:</label> + <label class="control-label" for="user_group_description">${_('Description')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="users_group_active">${_('Active')}:</label> + <label class="control-label" for="users_group_active">${_('Active')}:</label> </div> <div class="checkboxes"> ${h.checkbox('users_group_active',value=True)} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="users_group_active">${_('Members')}:</label> + <label class="control-label" for="users_group_active">${_('Members')}:</label> </div> <div class="select"> - <table> + <table class="table"> <tr> <td> <div>
--- a/kallithea/templates/admin/users/user_add.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/users/user_add.html Mon Oct 24 21:45:09 2016 +0200 @@ -26,64 +26,64 @@ ${h.form(url('new_user'))} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="username">${_('Username')}:</label> + <label class="control-label" for="username">${_('Username')}:</label> </div> <div class="input"> ${h.text('username',class_='small')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="password">${_('Password')}:</label> + <label class="control-label" for="password">${_('Password')}:</label> </div> <div class="input"> ${h.password('password',class_='small')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="password_confirmation">${_('Password confirmation')}:</label> + <label class="control-label" for="password_confirmation">${_('Password confirmation')}:</label> </div> <div class="input"> ${h.password('password_confirmation',class_="small")} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="firstname">${_('First Name')}:</label> + <label class="control-label" for="firstname">${_('First Name')}:</label> </div> <div class="input"> ${h.text('firstname',class_='small')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="lastname">${_('Last Name')}:</label> + <label class="control-label" for="lastname">${_('Last Name')}:</label> </div> <div class="input"> ${h.text('lastname',class_='small')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="email">${_('Email')}:</label> + <label class="control-label" for="email">${_('Email')}:</label> </div> <div class="input"> ${h.text('email',class_='small')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="active">${_('Active')}:</label> + <label class="control-label" for="active">${_('Active')}:</label> </div> <div class="checkboxes"> ${h.checkbox('active',value=True,checked='checked')}
--- a/kallithea/templates/admin/users/user_edit_api_keys.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_api_keys.html Mon Oct 24 21:45:09 2016 +0200 @@ -55,10 +55,10 @@ ${h.form(url('edit_user_api_keys_update', id=c.user.user_id))} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="description">${_('New API key')}:</label> + <label class="control-label" for="description">${_('New API key')}:</label> </div> <div class="input"> ${h.text('description', class_='medium', placeholder=_('Description'))}
--- a/kallithea/templates/admin/users/user_edit_emails.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_emails.html Mon Oct 24 21:45:09 2016 +0200 @@ -36,10 +36,10 @@ ${h.form(url('edit_user_emails_update', id=c.user.user_id))} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="new_email">${_('New email address')}:</label> + <label class="control-label" for="new_email">${_('New email address')}:</label> </div> <div class="input"> ${h.text('new_email', class_='medium')}
--- a/kallithea/templates/admin/users/user_edit_ips.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_ips.html Mon Oct 24 21:45:09 2016 +0200 @@ -36,10 +36,10 @@ ${h.form(url('edit_user_ips_update', id=c.user.user_id))} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="new_ip">${_('New IP address')}:</label> + <label class="control-label" for="new_ip">${_('New IP address')}:</label> </div> <div class="input"> ${h.text('new_ip', class_='medium')}
--- a/kallithea/templates/admin/users/user_edit_profile.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/admin/users/user_edit_profile.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,6 +1,6 @@ ${h.form(url('update_user', id=c.user.user_id))} <div class="form"> - <div class="field"> + <div class="form-group"> <div class="gravatar_box"> ${h.gravatar_div(c.user.email)} <p> @@ -17,92 +17,92 @@ %endif </div> </div> - <div class="fields"> + <div class="form-horizontal"> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="username">${_('Username')}:</label> + <label class="control-label" for="username">${_('Username')}:</label> </div> <div class="input"> ${h.text('username',class_='medium', readonly=c.readonly('username'))} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="email">${_('Email')}:</label> + <label class="control-label" for="email">${_('Email')}:</label> </div> <div class="input"> ${h.text('email',class_='medium', readonly=c.readonly('email'))} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="extern_type">${_('Source of Record')}:</label> + <label class="control-label" for="extern_type">${_('Source of Record')}:</label> </div> <div class="input"> ${h.text('extern_type',class_='medium',readonly="readonly")} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="extern_name">${_('Name in Source of Record')}:</label> + <label class="control-label" for="extern_name">${_('Name in Source of Record')}:</label> </div> <div class="input"> ${h.text('extern_name',class_='medium',readonly="readonly")} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="new_password">${_('New password')}:</label> + <label class="control-label" for="new_password">${_('New password')}:</label> </div> <div class="input"> ${h.password('new_password',class_='medium',readonly=c.readonly('password'))} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="password_confirmation">${_('New password confirmation')}:</label> + <label class="control-label" for="password_confirmation">${_('New password confirmation')}:</label> </div> <div class="input"> ${h.password('password_confirmation',class_="medium",readonly=c.readonly('password'))} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="firstname">${_('First Name')}:</label> + <label class="control-label" for="firstname">${_('First Name')}:</label> </div> <div class="input"> ${h.text('firstname',class_='medium', readonly=c.readonly('firstname'))} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="lastname">${_('Last Name')}:</label> + <label class="control-label" for="lastname">${_('Last Name')}:</label> </div> <div class="input"> ${h.text('lastname',class_='medium', readonly=c.readonly('lastname'))} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="active">${_('Active')}:</label> + <label class="control-label" for="active">${_('Active')}:</label> </div> <div class="checkboxes"> ${h.checkbox('active',value=True, readonly=c.readonly('active'))} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="admin">${_('Admin')}:</label> + <label class="control-label" for="admin">${_('Admin')}:</label> </div> <div class="checkboxes"> ${h.checkbox('admin',value=True, readonly=c.readonly('admin'))}
--- a/kallithea/templates/base/default_perms_box.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/base/default_perms_box.html Mon Oct 24 21:45:09 2016 +0200 @@ -8,10 +8,10 @@ ${h.form(form_url)} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="inherit_default_permissions">${_('Inherit defaults')}:</label> + <label class="control-label" for="inherit_default_permissions">${_('Inherit defaults')}:</label> </div> <div class="checkboxes"> ${h.checkbox('inherit_default_permissions',value=True)} @@ -23,9 +23,9 @@ </div> <div id="inherit_overlay"> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="create_repo_perm">${_('Create repositories')}:</label> + <label class="control-label" for="create_repo_perm">${_('Create repositories')}:</label> </div> <div class="checkboxes"> ${h.checkbox('create_repo_perm',value=True)} @@ -35,9 +35,9 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="create_user_group_perm">${_('Create user groups')}:</label> + <label class="control-label" for="create_user_group_perm">${_('Create user groups')}:</label> </div> <div class="checkboxes"> ${h.checkbox('create_user_group_perm',value=True)} @@ -47,9 +47,9 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="fork_repo_perm">${_('Fork repositories')}:</label> + <label class="control-label" for="fork_repo_perm">${_('Fork repositories')}:</label> </div> <div class="checkboxes"> ${h.checkbox('fork_repo_perm',value=True)}
--- a/kallithea/templates/changelog/changelog_summary_data.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/changelog/changelog_summary_data.html Mon Oct 24 21:45:09 2016 +0200 @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- %if c.repo_changesets: -<table> +<table class="table"> <tr> <th class="left"></th> <th class="left"></th>
--- a/kallithea/templates/forks/fork.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/forks/fork.html Mon Oct 24 21:45:09 2016 +0200 @@ -20,11 +20,11 @@ ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))} <div class="form"> <!-- fields --> - <div class="fields"> + <div class="form-horizontal"> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="repo_name">${_('Fork name')}:</label> + <label class="control-label" for="repo_name">${_('Fork name')}:</label> </div> <div class="input"> ${h.text('repo_name',class_="small")} @@ -33,9 +33,9 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-textarea"> - <label for="description">${_('Description')}:</label> + <label class="control-label" for="description">${_('Description')}:</label> </div> <div class="textarea editor"> ${h.textarea('description')} @@ -43,9 +43,9 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="repo_group">${_('Repository group')}:</label> + <label class="control-label" for="repo_group">${_('Repository group')}:</label> </div> <div class="input"> ${h.select('repo_group','',c.repo_groups,class_="medium")} @@ -53,9 +53,9 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="landing_rev">${_('Landing revision')}:</label> + <label class="control-label" for="landing_rev">${_('Landing revision')}:</label> </div> <div class="input"> ${h.select('landing_rev','',c.landing_revs,class_="medium")} @@ -63,18 +63,18 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="private">${_('Private')}:</label> + <label class="control-label" for="private">${_('Private')}:</label> </div> <div class="checkboxes"> ${h.checkbox('private',value="True")} <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span> </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="private">${_('Copy permissions')}:</label> + <label class="control-label" for="private">${_('Copy permissions')}:</label> </div> <div class="checkboxes"> ${h.checkbox('copy_permissions',value="True", checked="checked")} @@ -82,9 +82,9 @@ </div> </div> %if c.can_update: - <div class="field"> + <div class="form-group"> <div class="label label-checkbox"> - <label for="private">${_('Update after clone')}:</label> + <label class="control-label" for="private">${_('Update after clone')}:</label> </div> <div class="checkboxes"> ${h.checkbox('update_after_clone',value="True")}
--- a/kallithea/templates/password_reset.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/password_reset.html Mon Oct 24 21:45:09 2016 +0200 @@ -18,11 +18,11 @@ ${h.form(url('password_reset'))} <div class="form"> <!-- fields --> - <div class="fields"> + <div class="form-horizontal"> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="email">${_('Email Address')}:</label> + <label class="control-label" for="email">${_('Email Address')}:</label> </div> <div class="input"> ${h.text('email')} @@ -30,9 +30,9 @@ </div> %if c.captcha_active: - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="email">${_('Captcha')}:</label> + <label class="control-label" for="email">${_('Captcha')}:</label> </div> <div class="input"> ${h.hidden('recaptcha_field')}
--- a/kallithea/templates/password_reset_confirmation.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/password_reset_confirmation.html Mon Oct 24 21:45:09 2016 +0200 @@ -24,28 +24,28 @@ </div> <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="token">${_('Code you received in the email')}:</label> + <label class="control-label" for="token">${_('Code you received in the email')}:</label> </div> <div class="input"> ${h.text('token', class_='focus')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="password">${_('New Password')}:</label> + <label class="control-label" for="password">${_('New Password')}:</label> </div> <div class="input"> ${h.password('password',class_='focus')} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="password_confirm">${_('Confirm New Password')}:</label> + <label class="control-label" for="password_confirm">${_('Confirm New Password')}:</label> </div> <div class="input"> ${h.password('password_confirm',class_='focus')}
--- a/kallithea/templates/pullrequests/pullrequest.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest.html Mon Oct 24 21:45:09 2016 +0200 @@ -24,29 +24,29 @@ <div class="form"> <!-- fields --> - <div class="fields" style="float:left;width:50%;padding-right:30px;"> + <div class="form-horizontal" style="float:left;width:50%;padding-right:30px;"> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="pullrequest_title">${_('Title')}:</label> + <label class="control-label" for="pullrequest_title">${_('Title')}:</label> </div> <div class="input"> ${h.text('pullrequest_title',class_="large",placeholder=_('Summarize the changes - or leave empty'))} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label label-textarea"> - <label for="pullrequest_desc">${_('Description')}:</label> + <label class="control-label" for="pullrequest_desc">${_('Description')}:</label> </div> <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="field"> + <div class="form-group"> <div class="label label-textarea"> - <label for="pullrequest_desc">${_('Changeset flow')}:</label> + <label class="control-label" for="pullrequest_desc">${_('Changeset flow')}:</label> </div> <div class="input"> ##ORG @@ -83,7 +83,7 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="buttons"> ${h.submit('save',_('Create Pull Request'),class_="btn btn-default")} ${h.reset('reset',_('Reset'),class_="btn btn-default")}
--- a/kallithea/templates/pullrequests/pullrequest_data.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/pullrequests/pullrequest_data.html Mon Oct 24 21:45:09 2016 +0200 @@ -8,7 +8,7 @@ %endif <div class="table"> - <table> + <table class="table"> <thead> <tr> <th class="left">${_('Vote')}</th>
--- a/kallithea/templates/register.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/register.html Mon Oct 24 21:45:09 2016 +0200 @@ -18,55 +18,55 @@ ${h.form(url('register'))} <div class="form"> <!-- fields --> - <div class="fields"> - <div class="field"> + <div class="form-horizontal"> + <div class="form-group"> <div class="label"> - <label for="username">${_('Username')}:</label> + <label class="control-label" for="username">${_('Username')}:</label> </div> <div class="input"> ${h.text('username',class_="medium")} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="password">${_('Password')}:</label> + <label class="control-label" for="password">${_('Password')}:</label> </div> <div class="input"> ${h.password('password',class_="medium")} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="password_confirmation">${_('Re-enter password')}:</label> + <label class="control-label" for="password_confirmation">${_('Re-enter password')}:</label> </div> <div class="input"> ${h.password('password_confirmation',class_="medium")} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="firstname">${_('First Name')}:</label> + <label class="control-label" for="firstname">${_('First Name')}:</label> </div> <div class="input"> ${h.text('firstname',class_="medium")} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="lastname">${_('Last Name')}:</label> + <label class="control-label" for="lastname">${_('Last Name')}:</label> </div> <div class="input"> ${h.text('lastname',class_="medium")} </div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="email">${_('Email')}:</label> + <label class="control-label" for="email">${_('Email')}:</label> </div> <div class="input"> ${h.text('email',class_="medium")} @@ -74,9 +74,9 @@ </div> %if c.captcha_active: - <div class="field"> + <div class="form-group"> <div class="label"> - <label for="email">${_('Captcha')}:</label> + <label class="control-label" for="email">${_('Captcha')}:</label> </div> <div class="input"> ${h.hidden('recaptcha_field')}
--- a/kallithea/templates/search/search.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/search/search.html Mon Oct 24 21:45:09 2016 +0200 @@ -44,10 +44,10 @@ ${h.form(h.url('search'),method='get')} %endif <div class="form"> - <div class="fields"> + <div class="form-horizontal"> <div class="field field-first field-noborder"> <div class="label"> - <label for="q">${_('Search term')}:</label> + <label class="control-label" for="q">${_('Search term')}:</label> </div> <div class="input">${h.text('q',c.cur_query,class_="small")} <div class="button highlight"> @@ -57,7 +57,7 @@ <div style="font-weight: bold;clear:both;margin-left:200px">${c.runtime}</div> </div> - <div class="field"> + <div class="form-group"> <div class="label"> <label for="type">${_('Search in')}:</label> </div>
--- a/kallithea/templates/summary/summary.html Wed Sep 21 00:13:48 2016 +0200 +++ b/kallithea/templates/summary/summary.html Mon Oct 24 21:45:09 2016 +0200 @@ -66,8 +66,8 @@ </div> <!-- end box / title --> <div class="form"> - <div id="summary" class="fields"> - <div class="field"> + <div id="summary" class="form-horizontal"> + <div class="form-group"> <div class="label-summary"> <label>${_('Clone URL')}:</label> </div> @@ -80,14 +80,14 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label-summary"> <label>${_('Description')}:</label> </div> <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(c.db_repo.description, stylize=c.visual.stylify_metatags)}</div> </div> - <div class="field"> + <div class="form-group"> <div class="label-summary"> <label>${_('Trending files')}:</label> </div> @@ -103,7 +103,7 @@ </div> </div> - <div class="field"> + <div class="form-group"> <div class="label-summary"> <label>${_('Download')}:</label> </div>