diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css --- a/kallithea/public/css/style.css +++ b/kallithea/public/css/style.css @@ -798,7 +798,8 @@ div.header img { 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 @@ div.header img { 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 @@ div.header img { 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 @@ div.header img { 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 @@ div.header img { 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 @@ div.header img { 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 @@ div.label-summary label { } #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 @@ input.disabled { 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 @@ input.disabled { 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 @@ input.disabled { 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 @@ input.disabled { 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 @@ input.disabled { 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 @@ a.metatag[tag="license"]:hover { #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 @@ a.metatag[tag="license"]:hover { 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 @@ a.metatag[tag="license"]:hover { 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 @@ a.metatag[tag="license"]:hover { 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 @@ a.metatag[tag="license"]:hover { 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 @@ ins, div.options a:hover { 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 @@ div#legend_data, div#legend_container, d } #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 @@ div#legend_data, div#legend_container, d } #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 @@ div#legend_data, div#legend_container, d } #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 @@ div#legend_data, div#legend_container, d } #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 @@ div#legend_data, div#legend_container, d } #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 @@ div#legend_data, div#legend_container, d } #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#legend_data, div#legend_container, d } 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.buttons input, } 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 @@ div.form div.fields div.buttons { #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 @@ div.form div.fields div.buttons { } #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 @@ div.form div.fields div.buttons { } #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 @@ div.form div.fields div.buttons { } #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 @@ div.form div.fields div.buttons { } #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; diff --git a/kallithea/templates/admin/admin_log.html b/kallithea/templates/admin/admin_log.html --- a/kallithea/templates/admin/admin_log.html +++ b/kallithea/templates/admin/admin_log.html @@ -1,6 +1,6 @@ ## -*- coding: utf-8 -*- %if c.users_log: -
| ${_('Username')} | ${_('Action')} | diff --git a/kallithea/templates/admin/auth/auth_settings.html b/kallithea/templates/admin/auth/auth_settings.html --- a/kallithea/templates/admin/auth/auth_settings.html +++ b/kallithea/templates/admin/auth/auth_settings.html @@ -26,9 +26,9 @@ ## enabled auth plugins
|---|
| ${_('Prefix')} | ${_('Key')} | diff --git a/kallithea/templates/admin/repos/repo_edit_fields.html b/kallithea/templates/admin/repos/repo_edit_fields.html --- a/kallithea/templates/admin/repos/repo_edit_fields.html +++ b/kallithea/templates/admin/repos/repo_edit_fields.html @@ -27,27 +27,27 @@ ${h.form(url('create_repo_fields', repo_name=c.repo_name))}
|---|
|
diff --git a/kallithea/templates/admin/users/user_add.html b/kallithea/templates/admin/users/user_add.html
--- a/kallithea/templates/admin/users/user_add.html
+++ b/kallithea/templates/admin/users/user_add.html
@@ -26,64 +26,64 @@
${h.form(url('new_user'))}
-
-
+
+
-
+
${h.text('username',class_='small')}
+
-
+
${h.password('password',class_='small')}
+
-
+
${h.password('password_confirmation',class_="small")}
+
-
+
${h.text('firstname',class_='small')}
+
-
+
${h.text('lastname',class_='small')}
+
-
+
${h.text('email',class_='small')}
+
-
+
${h.checkbox('active',value=True,checked='checked')}
diff --git a/kallithea/templates/admin/users/user_edit_api_keys.html b/kallithea/templates/admin/users/user_edit_api_keys.html
--- a/kallithea/templates/admin/users/user_edit_api_keys.html
+++ b/kallithea/templates/admin/users/user_edit_api_keys.html
@@ -55,10 +55,10 @@
${h.form(url('edit_user_api_keys_update', id=c.user.user_id))}
-
-
+
+
-
+
${h.text('description', class_='medium', placeholder=_('Description'))}
diff --git a/kallithea/templates/admin/users/user_edit_emails.html b/kallithea/templates/admin/users/user_edit_emails.html
--- a/kallithea/templates/admin/users/user_edit_emails.html
+++ b/kallithea/templates/admin/users/user_edit_emails.html
@@ -36,10 +36,10 @@
${h.form(url('edit_user_emails_update', id=c.user.user_id))}
-
-
+
+ |