kallithea Changeset - dd42c2ad28d7

Changeset - dd42c2ad28d7

Parent rev.

Child rev.

[Not reviewed]

default

0 35 0

Mads Kiilerich - 9 years ago 2016-12-04 22:53:36
mads@kiilerich.com

style: drop 'input' class inside 'form-group'

As long as we use the old styling, just apply styling to div inside form-group.

Based on work by Dominik Ruf.

35 files changed with 126 insertions and 128 deletions:

kallithea/public/css/style.css

kallithea/templates/admin/auth/auth_settings.html

kallithea/templates/admin/defaults/defaults.html

kallithea/templates/admin/my_account/my_account_api_keys.html

kallithea/templates/admin/my_account/my_account_emails.html

kallithea/templates/admin/my_account/my_account_password.html

kallithea/templates/admin/my_account/my_account_profile.html

kallithea/templates/admin/permissions/permissions_ips.html

kallithea/templates/admin/repo_groups/repo_group_add.html

kallithea/templates/admin/repo_groups/repo_group_edit_settings.html

kallithea/templates/admin/repos/repo_add_base.html

kallithea/templates/admin/repos/repo_edit_fields.html

kallithea/templates/admin/repos/repo_edit_settings.html

kallithea/templates/admin/settings/settings_email.html

kallithea/templates/admin/settings/settings_global.html

kallithea/templates/admin/settings/settings_hooks.html

kallithea/templates/admin/settings/settings_vcs.html

kallithea/templates/admin/settings/settings_visual.html

kallithea/templates/admin/user_groups/user_group_add.html

kallithea/templates/admin/user_groups/user_group_edit_settings.html

kallithea/templates/admin/users/user_add.html

kallithea/templates/admin/users/user_edit_api_keys.html

kallithea/templates/admin/users/user_edit_emails.html

kallithea/templates/admin/users/user_edit_ips.html

kallithea/templates/admin/users/user_edit_profile.html

kallithea/templates/base/base.html

kallithea/templates/forks/fork.html

kallithea/templates/login.html

kallithea/templates/password_reset.html

kallithea/templates/password_reset_confirmation.html

kallithea/templates/pullrequests/pullrequest.html

kallithea/templates/pullrequests/pullrequest_show.html

kallithea/templates/register.html

kallithea/templates/search/search.html

kallithea/templates/summary/summary.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -825,117 +825,115 @@ div.header img { @@
 #content div.panel div.form div.form-horizontal div.form-group span.success {
     height: 1%;
     display: block;
     color: #316309;
     margin: 8px 0 0;
     padding: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group > label {
     margin: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group > label {
     width: 155px;
     position: absolute;
     margin: 0;
     padding: 0px 0 0 0px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > label {
     color: #393939;
     font-weight: 700;
+}
-#content div.panel div.form div.form-horizontal div.form-group div.input {
+#content div.panel div.form div.form-horizontal div.form-group > div {
     margin: 0 20px 0 200px;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.input.summary {
     margin: 0 0 0 110px;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.input.summary-short {
 #content div.panel div.form div.form-horizontal div.form-group > div.summary,
 #content div.panel div.form div.form-horizontal div.form-group > div.summary-short {
     margin: 10px 20px 10px 110px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div.summary-short input {
     margin: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.file {
+#content div.panel div.form div.form-horizontal div.form-group > div.file {
     margin: 0 20px 0 200px;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.editor {
+#content div.panel div.form div.form-horizontal div.form-group > div.editor {
     margin: 0 10px 0 200px;
+}
 #content div.panel div.form div.form-horizontal div.form-group > label > input,
-#content div.panel div.form div.form-horizontal div.form-group div.input input,
+#content div.panel div.form div.form-horizontal div.form-group > div input,
 .reviewer_ac input {
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 12px;
     margin: 5px 0 10px;
     padding: 7px 7px 6px;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.input input#clone_url,
 #content div.panel div.form div.form-horizontal div.form-group div.input input#clone_url_id
 #content div.panel div.form div.form-horizontal div.form-group > div input#clone_url,
 #content div.panel div.form div.form-horizontal div.form-group > div input#clone_url_id
+{
     font-size: 14px;
     padding: 0 2px;
+}
 #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;
     border-width: 1px;
     color: #000000;
     font-size: 12px;
     margin: 0;
     padding: 7px 7px 6px;
+}
 input[readonly],
 input.disabled {
     background-color: #F5F5F5 !important;
+}
 #content div.panel div.form div.form-horizontal div.form-group > div select.form-control,
 #content div.panel div.form div.form-horizontal div.form-group > div div.form-control.select2-container,
-#content div.panel div.form div.form-horizontal div.form-group div.input input.form-control {
+#content div.panel div.form div.form-horizontal div.form-group > div input.form-control {
     width: 100%;
     margin: 5px 0 10px;
+}
-#content div.panel div.form div.form-horizontal div.form-group div.input input.date {
+#content div.panel div.form div.form-horizontal div.form-group > div input.date {
     width: 177px;
+}
-#content div.panel div.form div.form-horizontal div.form-group div.input input.button {
+#content div.panel div.form div.form-horizontal div.form-group > div input.button {
     background: #D4D0C8;
     border-top: 1px solid #FFF;
     border-left: 1px solid #FFF;
     border-right: 1px solid #404040;
     border-bottom: 1px solid #404040;
     color: #000;
     margin: 0;
     padding: 4px 8px;
+}
 #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;
     border-bottom: 1px solid #eaeaea;
     margin: 0 20px 0 200px;
     padding: 7px 7px 6px;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.textarea-editor {
     border: 1px solid #ddd;
     padding: 0;
+}
@@ @@ -1520,49 +1518,49 @@ a.metatag[tag="license"]:hover { @@
+}
 #quick_login .email,
 #quick_login .unread {
     color: #FFFFFF;
     padding: 3px 3px 3px 6px;
+}
 #quick_login .links .logout {
+}
 #quick_login div.form div.fields,
 #quick_login div.form div.form-horizontal {
     padding-top: 2px;
     padding-left: 10px;
+}
 #quick_login div.form div.form-horizontal div.form-group {
     padding: 5px;
+}
 #quick_login div.form div.form-horizontal div.form-group > label {
     color: #fff;
     padding-bottom: 3px;
+}
-#quick_login div.form div.form-horizontal div.form-group div.input input {
+#quick_login div.form div.form-horizontal div.form-group > div input {
     width: 236px;
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 11px;
     margin: 0;
     padding: 5px 7px 4px;
+}
 #quick_login div.form div.fields div.buttons,
 #quick_login div.form div.form-horizontal div.buttons {
     clear: both;
     overflow: hidden;
     text-align: right;
     margin: 0;
     padding: 5px 14px 0px 5px;
+}
 #quick_login div.form div.links {
     clear: both;
     overflow: hidden;
@@ @@ -1600,49 +1598,49 @@ a.metatag[tag="license"]:hover { @@
     position: relative;
     background-color: #577632;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #577632, #577632);
     margin: 0 auto;
     padding: 0;
+}
 #register div.inner {
     background: #FFF;
     border-top: none;
     border-bottom: none;
     margin: 0 auto;
     padding: 20px;
+}
 #register div.form div.form-horizontal div.form-group > label {
     width: 135px;
     float: left;
     text-align: right;
     margin: 2px 10px 0 0;
     padding: 5px 0 0 5px;
+}
-#register div.form div.form-horizontal div.form-group div.input input {
+#register div.form div.form-horizontal div.form-group > div input {
     width: 300px;
     background: #FFF;
     border-top: 1px solid #b3b3b3;
     border-left: 1px solid #b3b3b3;
     border-right: 1px solid #eaeaea;
     border-bottom: 1px solid #eaeaea;
     color: #000;
     font-size: 11px;
     margin: 0;
     padding: 7px 7px 6px;
+}
 #register div.form div.fields div.buttons,
 #register div.form div.form-horizontal div.buttons {
     clear: both;
     overflow: hidden;
     border-top: 1px solid #DDD;
     text-align: left;
     margin: 0;
     padding: 10px 0 0 150px;
+}
 #register div.form div.activation_msg {
     padding-top: 4px;
@@ @@ -2943,49 +2941,49 @@ div.gravatar { @@
     border-radius: 3px;
+}
 div.gravatar img {
     border-radius: 2px;
+}
 #header, #content, #footer {
     min-width: 978px;
+}
 #content {
     clear: both;
     padding: 10px 10px 14px 10px;
+}
 #content.hover {
     padding: 55px 10px 14px 10px !important;
+}
 #content div.panel div.panel-heading div.search {
     border-left: 1px solid #576622;
+}
-#content div.panel div.panel-heading div.search div.input input {
+#content div.panel div.panel-heading div.search > div input {
     border: 1px solid #576622;
+}
 .label,
 .btn {
     color: #515151;
     background-color: #DADADA;
     background-repeat: repeat-x;
     background-image: linear-gradient(to bottom, #F4F4F4, #DADADA);
     border-top: 1px solid #DDD;
     border-left: 1px solid #c6c6c6;
     border-right: 1px solid #DDD;
     border-bottom: 1px solid #c6c6c6;
     outline: none;
     margin: 0px 3px 3px 0px;
     border-radius: 4px 4px 4px 4px !important;
     padding: 3px 3px 3px 3px;
     display: inline-block;
     white-space: nowrap;
+}
 .btn {
     cursor: pointer !important;
+}
@@ @@ -3231,61 +3229,61 @@ div#legend_data, div#legend_container, d @@
+}
 #content div.panel div.form,
 #content div.panel div.table,
 #content div.panel div.traffic {
     position: relative;
     clear: both;
     margin: 0;
     padding: 0 20px 10px;
+}
 #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.form-horizontal {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.input input.error,
 #login div.form div.form-horizontal div.form-group div.input input.error,
 #register div.form div.form-horizontal div.form-group div.input input.error {
 #content div.panel div.form div.form-horizontal div.form-group > div input.error,
 #login div.form div.form-horizontal div.form-group > div input.error,
 #register div.form div.form-horizontal div.form-group > div input.error {
     background: #FBE3E4;
     border-top: 1px solid #e1b2b3;
     border-left: 1px solid #e1b2b3;
     border-right: 1px solid #FBC2C4;
     border-bottom: 1px solid #FBC2C4;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.input input.success,
 #login div.form div.form-horizontal div.form-group div.input input.success,
 #register div.form div.form-horizontal div.form-group div.input input.success {
 #content div.panel div.form div.form-horizontal div.form-group > div input.success,
 #login div.form div.form-horizontal div.form-group > div input.success,
 #register div.form div.form-horizontal div.form-group > div input.success {
     background: #E6EFC2;
     border-top: 1px solid #cebb98;
     border-left: 1px solid #cebb98;
     border-right: 1px solid #c6d880;
     border-bottom: 1px solid #c6d880;
+}
 #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.form-horizontal div.form-group div.select,
 #content div.panel div.form div.form-horizontal div.form-group div.checkboxes,
 #content div.panel div.form div.form-horizontal div.form-group div.radios {
     margin: 10px 20px 10px 200px;
     padding: 0;
+}
 #content div.panel div.form div.form-horizontal div.form-group div.select a: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;
@@ @@ -3330,50 +3328,50 @@ div.form div.form-horizontal div.buttons @@
     margin: 0;
+}
 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,
 #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 10px 0 200px;
     padding: 0;
+}
 #content div.panel table td.user,
 #content div.panel table td.address {
     width: 10%;
     text-align: center;
+}
 #content div.panel div.action div.button,
 #login div.form div.form-horizontal div.form-group div.input div.link,
 #register div.form div.form-horizontal div.form-group div.input div.link {
 #login div.form div.form-horizontal div.form-group > div div.link,
 #register div.form div.form-horizontal div.form-group > div div.link {
     text-align: right;
     margin: 6px 0 0;
     padding: 0;
+}
 #login, #register {
     width: 520px;
     margin: 10% auto 0;
     padding: 0;
+}
 #login div.color,
 #register div.color {
     clear: both;
     overflow: hidden;
     background: #FFF;
     margin: 10px auto 0;
     padding: 3px 3px 3px 0;
+}
 #login div.color a,
 #register div.color a {
     width: 20px;
     height: 20px;
@@ @@ -3394,49 +3392,49 @@ div.form div.form-horizontal div.buttons @@
 #register div.form div.form-horizontal div.form-group {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 0 10px;
+}
 #login div.form div.form-horizontal div.form-group span.error-message,
 #register div.form div.form-horizontal div.form-group span.error-message {
     height: 1%;
     display: block;
     color: red;
     margin: 8px 0 0;
     padding: 0;
     max-width: 320px;
+}
 #login div.form div.form-horizontal div.form-group label,
 #register div.form div.form-horizontal div.form-group > label {
     color: #000;
     font-weight: 700;
+}
 #login div.form div.form-horizontal div.form-group div,
-#register div.form div.form-horizontal div.form-group div.input {
+#register div.form div.form-horizontal div.form-group > div {
     float: left;
     margin: 0;
     padding: 0;
+}
 #login div.form div.form-horizontal div.form-group 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.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.form-horizontal div.buttons input {
     color: #000;
     font-size: 1em;
     font-weight: 700;
     margin: 0;

kallithea/templates/admin/auth/auth_settings.html

➞

Show inline comments

@@ @@ -8,111 +8,111 @@ @@
 <%def name="breadcrumbs_links()">
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${_('Authentication')}
 </%def>
 <%block name="header_menu">
     ${self.menu('admin')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('auth_settings'))}
     <div class="form">
     ## enabled auth plugins
     <h1>${_('Authentication Plugins')}</h1>
     <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="auth_plugins">${_("Enabled Plugins")}</label>
-            <div class="input">${h.text("auth_plugins", class_='form-control')}
             <div>${h.text("auth_plugins", class_='form-control')}
             <span class="help-block">${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}</span>
                 <div style="padding:10px 0px 10px 0px;font-weight: bold">${_('Available built-in plugins')}</div>
                 <ul>
                 %for plugin_path in c.available_plugins:
                     <li>
                       <div style="padding:3px 0px 3px 0px">
                         <span style="margin: 0px 10px 0px 0px" plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugins else ''}">
                             ${_('Enabled') if plugin_path in c.enabled_plugins else _('Disabled')}
                         </span>
                         ${plugin_path}
                       </div>
                     </li>
                 %endfor
                 </ul>
             </div>
         </div>
     </div>
     %for cnt, module in enumerate(c.enabled_plugins):
         <% pluginName = c.plugin_shortnames[module] %>
         <h1>${_('Plugin')}: ${pluginName}</h1>
         <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="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
-                <div class="input">
                 <div>
                     ${h.password(fullsetting,class_='form-control')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
             %elif setting["type"] in ["string", "int"]:
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
-                <div class="input">
                 <div>
                     ${h.text(fullsetting,class_='form-control')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
             %elif setting["type"] == "bool":
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div class="checkboxes">
                     <div class="checkbox">${h.checkbox(fullsetting,True)}</div>
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
             %elif setting["type"] == "select":
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div class="select">
                     ${h.select(fullsetting,setting['values'][0],setting['values'],class_='form-control')}
                     <span class="help-block">${setting["description"]}</span>
                 </div>
             </div>
             %else:
             <div class="form-group">
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
-                <div class="input">This field is of type ${setting['type']}, which cannot be displayed. Must be one of [string|int|bool|select].</div>
                 <div>This field is of type ${setting['type']}, which cannot be displayed. Must be one of [string|int|bool|select].</div>
                 <span class="help-block">${setting["description"]}</span>
             </div>
             %endif
         %endfor
         </div>
     %endfor
         <div class="form-horizontal">
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $('.toggle-plugin').click(function(e){
         var $auth_plugins_input = $('#auth_plugins');
         var notEmpty = function(element, index, array) {
             return (element != "");
+        }
         var elems = $auth_plugins_input.val().split(',').filter(notEmpty);

kallithea/templates/admin/defaults/defaults.html

➞

Show inline comments

@@ @@ -9,49 +9,49 @@ @@
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${_('Repository Defaults')}
 </%def>
 <%block name="header_menu">
     ${self.menu('admin')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('defaults_update', id='defaults'))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="default_repo_type">${_('Type')}:</label>
-                <div class="input">
                 <div>
                     ${h.select('default_repo_type','hg',c.backends,class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_repo_private">${_('Private repository')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('default_repo_private',value="True")}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_repo_enable_statistics">${_('Enable statistics')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('default_repo_enable_statistics',value="True")}
                     <span class="help-block">${_('Enable statistics window on summary page.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="default_repo_enable_downloads">${_('Enable downloads')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('default_repo_enable_downloads',value="True")}

kallithea/templates/admin/my_account/my_account_api_keys.html

➞

Show inline comments

@@ @@ -37,47 +37,47 @@ @@
                 ${h.form(url('my_account_api_keys_delete'))}
                     ${h.hidden('del_api_key',api_key.api_key)}
                     <button class="btn btn-danger btn-xs" type="submit"
                             onclick="return confirm('${_('Confirm to remove this API key: %s') % api_key.api_key}');">
                         <i class="icon-minus-circled"></i>
                         ${_('Remove')}
                     </button>
                 ${h.end_form()}
             </td>
           </tr>
         %endfor
     %else:
     <tr><td><div class="ip">${_('No additional API keys specified')}</div></td></tr>
     %endif
   </table>
 </div>
 <div>
     ${h.form(url('my_account_api_keys'), method='post')}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label for="description">${_('New API key')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('description', class_='form-control', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Add'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         $("#lifetime").select2({
             'dropdownAutoWidth': true
         });
     });
 </script>

kallithea/templates/admin/my_account/my_account_emails.html

➞

Show inline comments

@@ @@ -18,38 +18,38 @@ @@
             <td><div class="email">${em.email}</div></td>
             <td>
                 ${h.form(url('my_account_emails_delete'))}
                     ${h.hidden('del_email_id',em.email_id)}
                     <i class="icon-minus-circled" style="color:#FF4444"></i>
                     ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id,
                     class_="btn btn-default btn-xs", onclick="return  confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}
                 ${h.end_form()}
             </td>
           </tr>
         %endfor
     %else:
     <tr><td><div class="ip">${_('No additional emails specified.')}</div></td></tr>
     %endif
   </table>
 </div>
 <div>
     ${h.form(url('my_account_emails'), method='post')}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_email">${_('New email address')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('new_email', class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Add'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>

kallithea/templates/admin/my_account/my_account_password.html

➞

Show inline comments

 <div style="font-size: 20px; color: #666666; padding: 0px 0px 10px 0px">${_('Change Your Account Password')}</div>
 %if c.can_change_password:
 ${h.form(url('my_account_password'), method='post')}
 <div class="form">
   <div class="form-horizontal">
     <div class="form-group">
         <label class="control-label" for="current_password">${_('Current password')}:</label>
-        <div class="input">
         <div>
             ${h.password('current_password',class_='form-control')}
         </div>
     </div>
     <div class="form-group">
         <label class="control-label" for="new_password">${_('New password')}:</label>
-        <div class="input">
         <div>
             ${h.password('new_password',class_='form-control')}
         </div>
     </div>
     <div class="form-group">
         <label class="control-label" for="new_password_confirmation">${_('Confirm new password')}:</label>
-        <div class="input">
         <div>
             ${h.password('new_password_confirmation',class_='form-control')}
         </div>
     </div>
     <div class="form-group">
         <div class="buttons">
             ${h.submit('save',_('Save'),class_="btn btn-default")}
             ${h.reset('reset',_('Reset'),class_="btn btn-default")}
         </div>
     </div>
   </div>
 </div>
 ${h.end_form()}
 %else:
 ${_('This account is managed with %s and the password cannot be changed here') % c.user.extern_type}
 %endif

kallithea/templates/admin/my_account/my_account_profile.html

➞

Show inline comments

 ${h.form(url('my_account'), method='post')}
     <div class="form">
         <div class="form-horizontal">
             <div class="form-group">
                 <div class="gravatar_box">
                     ${h.gravatar_div(c.user.email)}
                     <p>
                     %if c.visual.use_gravatar:
                         <strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
                         <br/>${_('Using')} ${c.user.email}
                     %else:
                         <strong>${_('Avatars are disabled')}</strong>
                         <br/>${c.user.email or _('Missing email, please update your user email address.')}
                         [${_('Current IP')}: ${c.ip_addr}]
                     %endif
                     </p>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="username">${_('Username')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('username',class_='form-control', readonly=c.readonly('username'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="firstname">${_('First Name')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('firstname',class_='form-control', readonly=c.readonly('firstname'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="lastname">${_('Last Name')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('lastname',class_='form-control', readonly=c.readonly('lastname'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="email">${_('Email')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('email',class_='form-control', readonly=c.readonly('email'))}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/permissions/permissions_ips.html

➞

Show inline comments

@@ @@ -6,38 +6,38 @@ @@
               <td><div class="ip">${ip.ip_addr}</div></td>
               <td><div class="ip">${h.ip_range(ip.ip_addr)}</div></td>
               <td>
                 ${h.form(url('edit_user_ips_delete', id=c.user.user_id))}
                     ${h.hidden('del_ip_id',ip.ip_id)}
                     ${h.hidden('default_user', 'True')}
                     <i class="icon-minus-circled" style="color:#FF4444"></i> ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id,
                     class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")}
                 ${h.end_form()}
               </td>
           </tr>
         %endfor
        %else:
         <tr><td><div class="ip">${_('All IP addresses are allowed.')}</div></td></tr>
        %endif
       </table>
 </div>
 ${h.form(url('edit_user_ips_update', id=c.user.user_id))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_ip">${_('New IP address')}:</label>
-                <div class="input">
                 <div>
                     ${h.hidden('default_user', 'True')}
                     ${h.text('new_ip', class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Add'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/repo_groups/repo_group_add.html

➞

Show inline comments

@@ @@ -9,63 +9,63 @@ @@
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Repository Groups'),h.url('repos_groups'))}
     &raquo;
     ${_('Add Repository Group')}
 </%def>
 <%block name="header_menu">
     ${self.menu('admin')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('repos_groups'))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="group_name">${_('Group name')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('group_name',class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="group_description">${_('Description')}:</label>
                 <div class="textarea-repo editor">
                     ${h.textarea('group_description',cols=23,rows=5)}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="parent_group_id">${_('Group parent')}:</label>
-                <div class="input">
                 <div>
                     ${h.select('parent_group_id',request.GET.get('parent_group'),c.repo_groups,class_='form-control')}
                 </div>
             </div>
             <div id="copy_perms" class="form-group">
                 <label class="control-label" for="group_copy_permissions">${_('Copy parent group permissions')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('group_copy_permissions',value="True")}
                     <span class="help-block">${_('Copy permission set from parent repository group.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         var setCopyPermsOption = function(group_val){

kallithea/templates/admin/repo_groups/repo_group_edit_settings.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ${h.form(url('update_repos_group',group_name=c.repo_group.group_name))}
 <div class="form">
     <!-- fields -->
     <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="group_name">${_('Group name')}:</label>
-            <div class="input">
             <div>
                 ${h.text('group_name',class_='form-control')}
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="group_description">${_('Description')}:</label>
             <div class="textarea text-area editor">
                 ${h.textarea('group_description',cols=23,rows=5)}
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="parent_group_id">${_('Group parent')}:</label>
-            <div class="input">
             <div>
                 ${h.select('parent_group_id','',c.repo_groups,class_='form-control')}
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="enable_locking">${_('Enable locking')}:</label>
             <div class="checkboxes">
                 ${h.checkbox('enable_locking',value="True")}
                 <span class="help-block">${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')}</span>
             </div>
         </div>
         <div class="form-group">
             <div class="buttons">
                 ${h.submit('save',_('Save'),class_="btn btn-default")}
                 ${h.reset('reset',_('Reset'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 </div>
 ${h.end_form()}
 ${h.form(url('delete_repo_group', group_name=c.repo_group.group_name))}
 <div class="form">

kallithea/templates/admin/repos/repo_add_base.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ${h.form(url('repos'))}
 <div class="form">
     <!-- fields -->
     <div class="form-horizontal">
         <div class="form-group">
             <label class="control-label" for="repo_name">${_('Name')}:</label>
-            <div class="input">
             <div>
                 ${h.text('repo_name',class_='form-control')}
             </div>
          </div>
         <div id="remote_clone" class="form-group">
             <label class="control-label" for="clone_uri">${_('Clone remote repository')}:</label>
-            <div class="input">
             <div>
                 ${h.text('clone_uri',class_='form-control')}
                 <span class="help-block">
                     ${_('Optional: URL of a remote repository. If set, the repository will be created as a clone from this URL.')}
                 </span>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_description">${_('Description')}:</label>
             <div class="textarea-repo editor">
                 ${h.textarea('repo_description')}
                 <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_group">${_('Repository group')}:</label>
-            <div class="input">
             <div>
                 ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_='form-control')}
                 <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
             </div>
         </div>
         <div id="copy_perms" class="form-group">
             <label class="control-label" for="repo_copy_permissions">${_('Copy parent group permissions')}:</label>
             <div class="checkboxes">
                 ${h.checkbox('repo_copy_permissions',value="True")}
                 <span class="help-block">${_('Copy permission set from parent repository group.')}</span>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_type">${_('Type')}:</label>
-            <div class="input">
             <div>
                 ${h.select('repo_type','hg',c.backends,class_='form-control')}
                 <span class="help-block">${_('Type of repository to create.')}</span>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label>
-            <div class="input">
             <div>
                 ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')}
                 <span class="help-block">${_('Default revision for files page, downloads, full text search index and readme generation')}</span>
             </div>
         </div>
         <div class="form-group">
             <label class="control-label" for="repo_private">${_('Private repository')}:</label>
             <div class="checkboxes">
                 ${h.checkbox('repo_private',value="True")}
                 <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
             </div>
         </div>
         <div class="form-group">
             <div class="buttons">
                 ${h.submit('add',_('Add'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 </div>
 <script>
     $(document).ready(function(){
         var setCopyPermsOption = function(group_val){
             if(group_val != "-1"){
                 $('#copy_perms').show();
+            }

kallithea/templates/admin/repos/repo_edit_fields.html

➞

Show inline comments

@@ @@ -9,57 +9,57 @@ @@
       %for field in c.repo_fields:
         <tr>
             <td>${field.field_label}</td>
             <td>${field.field_key}</td>
             <td>${field.field_type}</td>
             <td>
               ${h.form(url('delete_repo_fields', repo_name=c.repo_info.repo_name, field_id=field.repo_field_id))}
                   <i class="icon-minus-circled" style="color:#FF4444"></i>
                   ${h.submit('remove_%s' % field.repo_field_id, _('Delete'), id="remove_field_%s" % field.repo_field_id,
                   class_="btn btn-default btn-xs", onclick="return confirm('"+_('Confirm to delete this field: %s') % field.field_key+"');")}
               ${h.end_form()}
             </td>
         </tr>
       %endfor
       </table>
     </div>
     %endif
     ${h.form(url('create_repo_fields', repo_name=c.repo_name))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_field_key">${_('New field key')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('new_field_key', class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="new_field_label">${_('New field label')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('new_field_label', class_='form-control', placeholder=_('Enter short label'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="new_field_desc">${_('New field description')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('new_field_desc', class_='form-control', placeholder=_('Enter description of a field'))}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Add'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 %else:
   <div style="font-size: 20px">
     ${_('Extra fields are disabled.')}
   </div>
 %endif

kallithea/templates/admin/repos/repo_edit_settings.html

➞

Show inline comments

 ${h.form(url('update_repo', repo_name=c.repo_info.repo_name))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="repo_name">${_('Name')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('repo_name',class_='form-control')}
                     <span class="help-block">${_('Permanent Repository ID')}: `_${c.repo_info.repo_id}` <span><a id="show_more_clone_id" href="#">${_('What is that?')}</a></span></span>
                     <span id="clone_id" class="help-block" style="display: none">
                         ${_('URL by id')}: `${c.repo_info.clone_url(with_id=True)}` </br>
                         ${_('''In case this repository is renamed or moved into another group the repository URL changes.
                                Using the above permanent URL guarantees that this repository always will be accessible on that URL.
                                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="form-group">
                 <label class="control-label" for="clone_uri">${_('Remote repository')}:</label>
-                <div class="input">
                 <div>
                   <div id="alter_clone_uri">
                         ${h.text('clone_uri',class_='form-control', placeholder=_('Repository URL'))}
                         ${h.hidden('clone_uri_hidden', c.repo_info.clone_uri_hidden)}
                   </div>
                   <span id="alter_clone_uri_help_block" class="help-block">
                     ${_('Optional: URL of a remote repository. If set, the repository can be pulled from this URL.')}
                   </span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_group">${_('Repository group')}:</label>
-                <div class="input">
                 <div>
                     ${h.select('repo_group','',c.repo_groups,class_='form-control')}
                     <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label>
-                <div class="input">
                 <div>
                     ${h.select('repo_landing_rev','',c.landing_revs,class_='form-control')}
                     <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="owner">${_('Owner')}:</label>
-                <div class="input input-medium ac">
                 <div class="ac">
                     <div class="perm_ac">
                        ${h.text('owner',class_='yui-ac-input')}
                        <span class="help-block">${_('Change owner of this repository.')}</span>
                        <div id="owner_container"></div>
                     </div>
                 </div>
              </div>
             <div class="form-group">
                 <label class="control-label" for="repo_description">${_('Description')}:</label>
                 <div class="textarea text-area editor">
                     ${h.textarea('repo_description', style="height:165px")}
                     <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_private">${_('Private repository')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('repo_private',value="True")}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_enable_statistics">${_('Enable statistics')}:</label>
@@ @@ -71,49 +71,49 @@ ${h.form(url('update_repo', repo_name=c. @@
                     ${h.checkbox('repo_enable_statistics',value="True")}
                     <span class="help-block">${_('Enable statistics window on summary page.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_enable_downloads">${_('Enable downloads')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('repo_enable_downloads',value="True")}
                     <span class="help-block">${_('Enable download menu on summary page.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_enable_locking">${_('Enable locking')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('repo_enable_locking',value="True")}
                     <span class="help-block">${_('Enable lock-by-pulling on repository.')}</span>
                 </div>
             </div>
             %if c.visual.repository_fields:
               ## EXTRA FIELDS
               %for field in c.repo_fields:
                 <div class="form-group">
                     <label class="control-label" for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label>
-                    <div class="input input-medium">
                     <div>
                         ${h.text(field.field_key_prefixed, field.field_value, class_='form-control')}
                         %if field.field_desc:
                           <span class="help-block">${field.field_desc}</span>
                         %endif
                     </div>
                  </div>
               %endfor
             %endif
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 <script>
     $(document).ready(function(){
         $('#show_more_clone_id').on('click', function(e){
             $('#clone_id').show();
             e.preventDefault();
         });

kallithea/templates/admin/settings/settings_email.html

➞

Show inline comments

 ${h.form(url('admin_settings_email'), method='post')}
     <div class="form">
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="test_email">${_('Send test email to')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('test_email',size=30)}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('send',_('Send'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/settings/settings_global.html

➞

Show inline comments

 ${h.form(url('admin_settings_global'), method='post')}
     <div class="form">
         <div class="form-horizontal">
              <div class="form-group">
                 <label class="control-label" for="title">${_('Site branding')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('title',size=30)}
                     <span class="help-block">${_('Set a custom title for your Kallithea Service.')}</span>
                 </div>
              </div>
             <div class="form-group">
                 <label class="control-label" for="realm">${_('HTTP authentication realm')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('realm',size=30)}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="ga_code">${_('HTML/JavaScript/CSS customization block')}:</label>
-                <div class="input">
                 <div>
                     ${h.textarea('ga_code', cols=80, rows=10)}
                     <span class="help-block">${_('HTML (possibly with \
                         JavaScript and/or CSS) that will be added to the bottom \
                         of every page. This can be used for web analytics \
                         systems like Google Analytics or Piwik, but also to \
                         perform instance-specific customizations like adding a \
                         project banner at the top of every page.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="captcha_public_key">${_('ReCaptcha public key')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('captcha_public_key',size=60)}
                     <span class="help-block">${_('Public key for reCaptcha system.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="captcha_private_key">${_('ReCaptcha private key')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('captcha_private_key',size=60)}
                     <span class="help-block">${_('Private key for reCaptcha system. Setting this value will enable captcha on registration.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
            </div>
         </div>
     </div>
 ${h.end_form()}

kallithea/templates/admin/settings/settings_hooks.html

➞

Show inline comments

 <h4>${_('Built-in Mercurial Hooks (Read-Only)')}</h4>
 <div class="form">
     <div class="form-horizontal">
       % for hook in c.hooks:
         <div class="form-group">
             <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label>
-            <div class="input" style="margin-left:280px">
             <div style="margin-left:280px">
               ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")}
             </div>
         </div>
       % endfor
     </div>
     <span class="help-block">${_('Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications.')}</span>
 </div>
 % if c.visual.allow_custom_hooks_settings:
 <h4>${_('Custom Hooks')}</h4>
 ${h.form(url('admin_settings_hooks'), method='post')}
 <div class="form">
     <div class="form-horizontal">
         %for hook in c.custom_hooks:
             <div class="form-group" id="${'id%s' % hook.ui_id }">
                 <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label>
-                <div class="input" style="margin-left:280px">
                 <div style="margin-left:280px">
                     ${h.hidden('hook_ui_key',hook.ui_key)}
                     ${h.hidden('hook_ui_value',hook.ui_value)}
                     ${h.text('hook_ui_value_new',hook.ui_value,size=60)}
                     <span class="btn btn-default btn-xs"
                         onclick="delete_hook(${hook.ui_id},'${'id%s' % hook.ui_id }')">
                         <i class="icon-minus-circled" style="color:#FF4444"></i>
                         ${_('Delete')}
                     </span>
                 </div>
             </div>
         %endfor
         <div class="form-group">
             <label>
                 ${h.text('new_hook_ui_key',size=20)}
             </label>
-            <div class="input" style="margin-left:280px">
             <div style="margin-left:280px">
                 ${h.text('new_hook_ui_value',size=60)}
             </div>
         </div>
         <div class="form-group">
             <div class="buttons" style="margin-left:280px">
                 ${h.submit('save',_('Save'),class_="btn btn-default")}
             </div>
         </div>
     </div>
 </div>
 ${h.end_form()}
 % endif
 <script type="text/javascript">
 function delete_hook(hook_id, field_id) {
     var sUrl = "${h.url('admin_settings_hooks_delete')}";
     var success = function (o) {
             $('#' + field_id).remove();
         };
     var failure = function (o) {
             alert("${_('Failed to remove hook')}");
         };
     var postData = {'hook_id': hook_id};
     ajaxPOST(sUrl, postData, success, failure);

kallithea/templates/admin/settings/settings_vcs.html

➞

Show inline comments

@@ @@ -23,49 +23,49 @@ ${h.form(url('admin_settings'), method=' @@
                 </div>
             </div>
             <div class="form-group">
                 <label>${_('Mercurial extensions')}:</label>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('extensions_largefiles','True')}
                         <label for="extensions_largefiles">${_('Enable largefiles extension')}</label>
                     </div>
                     <div class="checkbox">
                         ${h.checkbox('extensions_hgsubversion','True')}
                         <label for="extensions_hgsubversion">${_('Enable hgsubversion extension')}</label>
                     </div>
                     <span class="help-block">${_('Requires hgsubversion library to be installed. Enables cloning of remote Subversion repositories while converting them to Mercurial.')}</span>
                     ##<div class="checkbox">
                     ##    ${h.checkbox('extensions_hggit','True')}
                     ##    <label for="extensions_hggit">${_('Enable hg-git extension')}</label>
                     ##</div>
                     ##<span class="help-block">${_('Requires hg-git library to be installed. Enables cloning of remote Git repositories while converting them to Mercurial.')}</span>
                 </div>
             </div>
             %if c.visual.allow_repo_location_change:
             <div class="form-group">
                 <label class="control-label" for="paths_root_path">${_('Location of repositories')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('paths_root_path',size=60,readonly="readonly")}
                     <span id="path_unlock" data-toggle="tooltip" style="cursor: pointer"
                             title="${_('Click to unlock. You must restart Kallithea in order to make this setting take effect.')}">
                         <div class="btn btn-default btn-sm"><i id="path_unlock_icon" class="icon-lock"></i></div>
                     </span>
                     <span class="help-block">${_('Filesystem location where repositories are stored. After changing this value, a restart and rescan of the repository folder are both required.')}</span>
                 </div>
             </div>
             %else:
             ## form still requires this but we cannot internally change it anyway
             ${h.hidden('paths_root_path',size=30,readonly="readonly")}
             %endif
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save Settings'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
            </div>
         </div>
     </div>
     ${h.end_form()}
     <script type="text/javascript">
         $(document).ready(function(){

kallithea/templates/admin/settings/settings_visual.html

➞

Show inline comments

@@ @@ -2,85 +2,85 @@ ${h.form(url('admin_settings_visual'), m @@
     <div class="form">
         <div class="form-horizontal">
             <div class="form-group">
                 <label>${_('General')}:</label>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('repository_fields','True')}
                         <label for="repository_fields">${_('Use repository extra fields')}</label>
                     </div>
                     <span class="help-block">${_('Allows storing additional customized fields per repository.')}</span>
                     <div class="checkbox">
                         ${h.checkbox('show_version','True')}
                         <label for="show_version">${_('Show Kallithea version')}</label>
                     </div>
                     <span class="help-block">${_('Shows or hides a version number of Kallithea displayed in the footer.')}</span>
                     <div class="checkbox">
                         ${h.checkbox('use_gravatar','True')}
                         <label for="use_gravatar">${_('Use Gravatars in Kallithea')}</label>
                     </div>
                 </div>
-                <div class="input">
                 <div>
                         ${h.text('gravatar_url', size=80)}
                         <span class="help-block">${_('''Gravatar URL allows you to use another avatar server application.
                                                         The following variables of the URL will be replaced accordingly.
                                                         {scheme}    'http' or 'https' sent from running Kallithea server,
                                                         {email}     user email,
                                                         {md5email}  md5 hash of the user email (like at gravatar.com),
                                                         {size}      size of the image that is expected from the server application,
                                                         {netloc}    network location/server host of running Kallithea server''')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label>${_('Clone URL')}:</label>
-                <div class="input">
                 <div>
                         ${h.text('clone_uri_tmpl', size=80)}
                         <span class="help-block">${_('''Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'.
                                                         The following variables are available:
                                                         {scheme} 'http' or 'https' sent from running Kallithea server,
                                                         {user}   current user username,
                                                         {netloc} network location/server host of running Kallithea server,
                                                         {repo}   full repository name,
                                                         {repoid} ID of repository, can be used to construct clone-by-id''')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="page_size">${_('Repository page size')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('page_size',size=5)}
                     <span class="help-block">${_('Number of items displayed in the repository pages before pagination is shown.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="admin_grid_items">${_('Admin page size')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('admin_grid_items',size=5)}
                     <span class="help-block">${_('Number of items displayed in the admin pages grids before pagination is shown.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label>${_('Icons')}:</label>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('show_public_icon','True')}
                         <label for="show_public_icon">${_('Show public repository icon on repositories')}</label>
                     </div>
                     <div class="checkbox">
                         ${h.checkbox('show_private_icon','True')}
                         <label for="show_private_icon">${_('Show private repository icon on repositories')}</label>
                     </div>
                     <span class="help-block">${_('Show public/private icons next to repository names.')}</span>
                  </div>
             </div>
             <div class="form-group">
                 <label>${_('Meta Tagging')}:</label>
                 <div class="checkboxes">
                     <div class="checkbox">

kallithea/templates/admin/user_groups/user_group_add.html

➞

Show inline comments

@@ @@ -8,49 +8,49 @@ @@
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('User Groups'),h.url('users_groups'))}
     &raquo;
     ${_('Add User Group')}
 </%def>
 <%block name="header_menu">
     ${self.menu('admin')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('users_groups'))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="users_group_name">${_('Group name')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('users_group_name',class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="user_group_description">${_('Description')}:</label>
                 <div class="textarea text-area editor">
                     ${h.textarea('user_group_description')}
                     <span class="help-block">${_('Short, optional description for this user group.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="users_group_active">${_('Active')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('users_group_active',value=True, checked='checked')}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>

kallithea/templates/admin/user_groups/user_group_edit_settings.html

➞

Show inline comments

 ${h.form(url('update_users_group', id=c.user_group.users_group_id), id='edit_users_group')}
     <div class="form">
         <!-- fields -->
             <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label" for="users_group_name">${_('Group name')}:</label>
-                    <div class="input">
                     <div>
                         ${h.text('users_group_name',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="user_group_description">${_('Description')}:</label>
                     <div class="textarea-small editor">
                         ${h.textarea('user_group_description')}
                         <span class="help-block">${_('Short, optional description for this user group.')}</span>
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="users_group_active">${_('Active')}:</label>
                     <div class="checkboxes">
                         ${h.checkbox('users_group_active',value=True)}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label">${_('Members')}:</label>
                     <div class="select">
                         <table class="table">
                                 <tr>
                                     <td>
                                         <div>
                                             <div style="float:left">

kallithea/templates/admin/users/user_add.html

➞

Show inline comments

@@ @@ -8,84 +8,84 @@ @@
     ${h.link_to(_('Admin'),h.url('admin_home'))}
     &raquo;
     ${h.link_to(_('Users'),h.url('users'))}
     &raquo;
     ${_('Add User')}
 </%def>
 <%block name="header_menu">
     ${self.menu('admin')}
 </%block>
 <%def name="main()">
 <div class="panel panel-primary">
     <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     ${h.form(url('new_user'))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="username">${_('Username')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('username',class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="password">${_('Password')}:</label>
-                <div class="input">
                 <div>
                     ${h.password('password',class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="password_confirmation">${_('Password confirmation')}:</label>
-                <div class="input">
                 <div>
                     ${h.password('password_confirmation',class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="firstname">${_('First Name')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('firstname',class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="lastname">${_('Last Name')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('lastname',class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="email">${_('Email')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('email',class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="active">${_('Active')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True,checked='checked')}
                 </div>
             </div>
             ${h.hidden('extern_type', c.default_extern_type)}
             ${h.hidden('extern_name', c.default_extern_name)}
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>

kallithea/templates/admin/users/user_edit_api_keys.html

➞

Show inline comments

@@ @@ -37,48 +37,48 @@ @@
                 ${h.form(url('edit_user_api_keys_delete', id=c.user.user_id))}
                     ${h.hidden('del_api_key',api_key.api_key)}
                     <button class="btn btn-danger btn-xs" type="submit"
                             onclick="return confirm('${_('Confirm to remove this API key: %s') % api_key.api_key}');">
                         <i class="icon-minus-circled"></i>
                         ${_('Remove')}
                     </button>
                 ${h.end_form()}
             </td>
           </tr>
         %endfor
     %else:
     <tr><td><div class="ip">${_('No additional API keys specified')}</div></td></tr>
     %endif
   </table>
 </div>
 <div>
     ${h.form(url('edit_user_api_keys_update', id=c.user.user_id))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="description">${_('New API key')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('description', class_='form-control', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Add'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>
 <script>
     $(document).ready(function(){
         $("#lifetime").select2({
             'dropdownAutoWidth': true
         });
     });
 </script>

kallithea/templates/admin/users/user_edit_emails.html

➞

Show inline comments

@@ @@ -18,38 +18,38 @@ @@
             <td><div class="email">${em.email}</div></td>
             <td>
                 ${h.form(url('edit_user_emails_delete', id=c.user.user_id))}
                     ${h.hidden('del_email_id',em.email_id)}
                     <i class="icon-minus-circled" style="color:#FF4444"></i>
                     ${h.submit('remove_',_('Delete'),id="remove_email_%s" % em.email_id,
                     class_="btn btn-default btn-xs", onclick="return  confirm('"+_('Confirm to delete this email: %s') % em.email+"');")}
                 ${h.end_form()}
             </td>
           </tr>
         %endfor
     %else:
     <tr><td><div class="ip">${_('No additional emails specified.')}</div></td></tr>
     %endif
   </table>
 </div>
 <div>
     ${h.form(url('edit_user_emails_update', id=c.user.user_id))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_email">${_('New email address')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('new_email', class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Add'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>

kallithea/templates/admin/users/user_edit_ips.html

➞

Show inline comments

@@ @@ -18,38 +18,38 @@ @@
             <td>
                 ${h.form(url('edit_user_ips_delete', id=c.user.user_id))}
                     ${h.hidden('del_ip_id',ip.ip_id)}
                     <i class="icon-minus-circled" style="color:#FF4444"></i>
                     ${h.submit('remove_',_('Delete'),id="remove_ip_%s" % ip.ip_id,
                     class_="btn btn-default btn-xs", onclick="return  confirm('"+_('Confirm to delete this IP address: %s') % ip.ip_addr+"');")}
                 ${h.end_form()}
             </td>
           </tr>
         %endfor
     %endif
     %if not c.default_user_ip_map and not c.user_ip_map:
         <tr><td><div class="ip">${_('All IP addresses are allowed.')}</div></td></tr>
     %endif
   </table>
 </div>
 <div>
     ${h.form(url('edit_user_ips_update', id=c.user.user_id))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="new_ip">${_('New IP address')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('new_ip', class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Add'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>
         </div>
     </div>
     ${h.end_form()}
 </div>

kallithea/templates/admin/users/user_edit_profile.html

➞

Show inline comments

 ${h.form(url('update_user', id=c.user.user_id))}
     <div class="form">
         <div class="form-group">
             <div class="gravatar_box">
                 ${h.gravatar_div(c.user.email)}
                 <p>
                 %if c.visual.use_gravatar:
                 <strong>${_('Change avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
                 <br/>${_('Using')} ${c.user.email}
                 %else:
                 <strong>${_('Avatars are disabled')}</strong>
                 <br/>${c.user.email or _('Missing email, please update this user email address.')}
                         ##show current ip just if we show ourself
                         %if c.authuser.username == c.user.username:
                             [${_('Current IP')}: ${c.ip_addr}]
                         %endif
                 %endif
             </div>
         </div>
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="username">${_('Username')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('username',class_='form-control', readonly=c.readonly('username'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="email">${_('Email')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('email',class_='form-control', readonly=c.readonly('email'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="extern_type">${_('Source of Record')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('extern_type',class_='form-control',readonly="readonly")}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="extern_name">${_('Name in Source of Record')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('extern_name',class_='form-control',readonly="readonly")}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="new_password">${_('New password')}:</label>
-                <div class="input">
                 <div>
                     ${h.password('new_password',class_='form-control',readonly=c.readonly('password'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="password_confirmation">${_('New password confirmation')}:</label>
-                <div class="input">
                 <div>
                     ${h.password('password_confirmation',class_='form-control',readonly=c.readonly('password'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="firstname">${_('First Name')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('firstname',class_='form-control', readonly=c.readonly('firstname'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="lastname">${_('Last Name')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('lastname',class_='form-control', readonly=c.readonly('lastname'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="active">${_('Active')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True, readonly=c.readonly('active'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="admin">${_('Admin')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('admin',value=True, readonly=c.readonly('admin'))}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('save',_('Save'),class_="btn btn-default")}
                     ${h.reset('reset',_('Reset'),class_="btn btn-default")}
                 </div>
             </div>

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -352,56 +352,56 @@ @@
         %else:
           href="#"
         %endif
+      >
           ${h.gravatar_div(c.authuser.email, size=20, div_class="icon", div_style="display:inline", div_aria_hidden="true")}
           %if c.authuser.username != 'default':
             <span class="menu_link_user">${c.authuser.username}</span>
             %if c.unread_notifications != 0:
               <span class="badge">${c.unread_notifications}</span>
             %endif
           %else:
               <span>${_('Not Logged In')}</span>
           %endif
       </a>
       <div class="user-menu" role="menu">
         <div id="quick_login" role="form" aria-describedby="quick_login_h" aria-hidden="true" class="dropdown-menu">
           %if c.authuser.username == 'default' or c.authuser.user_id is None:
             <h4 id="quick_login_h">${_('Login to Your Account')}</h4>
             ${h.form(h.url('login_home', came_from=request.path_qs))}
             <div class="form">
                 <div class="fields">
                     <div>
                         <label for="username">${_('Username')}:</label>
-                        <div class="input">
                         <div>
                             ${h.text('username',class_='form-control')}
                         </div>
                     </div>
                     <div>
                         <label for="password">${_('Password')}:</label>
-                        <div class="input">
                         <div>
                             ${h.password('password',class_='form-control')}
                         </div>
                     </div>
                     <div class="buttons">
                         <div class="password_forgoten">${h.link_to(_('Forgot password ?'),h.url('reset_password'))}</div>
                         <div class="register">
                         %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
                          ${h.link_to(_("Don't have an account ?"),h.url('register'))}
                         %endif
                         </div>
                         <div class="submit">
                             ${h.submit('sign_in',_('Log In'),class_="btn btn-default btn-xs")}
                         </div>
                     </div>
                 </div>
             </div>
             ${h.end_form()}
           %else:
             <div class="links_left">
                 ${h.gravatar_div(c.authuser.email, size=48, div_class="big_gravatar")}
                 <div class="full_name">${c.authuser.full_name_or_username}</div>
                 <div class="email">${c.authuser.email}</div>
             </div>

kallithea/templates/forks/fork.html

➞

Show inline comments

@@ @@ -3,74 +3,74 @@ @@
 <%block name="title">
     ${_('Fork repository %s') % c.repo_name}
 </%block>
 <%def name="breadcrumbs_links()">
     ${_('Fork')}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('createfork')}
 <div class="panel panel-primary">
     <!-- box / title -->
     ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="repo_name">${_('Fork name')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('repo_name',class_='form-control')}
                     ${h.hidden('repo_type',c.repo_info.repo_type)}
                     ${h.hidden('fork_parent_id',c.repo_info.repo_id)}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="description">${_('Description')}:</label>
                 <div class="textarea editor">
                     ${h.textarea('description')}
                     <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="repo_group">${_('Repository group')}:</label>
-                <div class="input">
                 <div>
                     ${h.select('repo_group','',c.repo_groups,class_='form-control')}
                     <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="landing_rev">${_('Landing revision')}:</label>
-                <div class="input">
                 <div>
                     ${h.select('landing_rev','',c.landing_revs,class_='form-control')}
                     <span class="help-block">${_('Default revision for files page, downloads, whoosh, and readme.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="private">${_('Private')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="copy_permissions">${_('Copy permissions')}:</label>
                 <div class="checkboxes">
                     ${h.checkbox('copy_permissions',value="True", checked="checked")}
                     <span class="help-block">${_('Copy permissions from forked repository')}</span>
                 </div>
             </div>
             %if c.can_update:
             <div class="form-group">
                 <label class="control-label" for="update_after_clone">${_('Update after clone')}:</label>

kallithea/templates/login.html

➞

Show inline comments

@@ @@ -3,56 +3,56 @@ @@
 <%block name="title">
     ${_('Log In')}
 </%block>
 <div id="login" class="panel panel-default">
     <%include file="/base/flash_msg.html"/>
     <!-- login -->
     <div class="panel-heading title withlogo">
         %if c.site_name:
             <h5>${_('Log In to %s') % c.site_name}</h5>
         %else:
             <h5>${_('Log In')}</h5>
         %endif
     </div>
     <div class="panel-body inner">
         ${h.form(url('login_home', came_from=c.came_from))}
         <div class="form">
             <i class="icon-lock"></i>
             <!-- fields -->
             <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label col-sm-5" for="username">${_('Username')}:</label>
-                    <div class="input col-sm-7">
                     <div class="col-sm-7">
                         ${h.text('username',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label col-sm-5" for="password">${_('Password')}:</label>
-                    <div class="input col-sm-7">
                     <div class="col-sm-7">
                         ${h.password('password',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="col-sm-offset-5 col-sm-7">
                         <div class="checkbox">
                             <label for="remember">
                                 <input type="checkbox" id="remember" name="remember"/>
                                 ${_('Stay logged in after browser restart')}
                             </label>
                         </div>
                     </div>
                 </div>
             </div>
             <!-- end fields -->
             <!-- links -->
             <div class="links">
                 ${h.link_to(_('Forgot your password ?'),h.url('reset_password'))}
                 %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')():
+                  /
                  ${h.link_to(_("Don't have an account ?"),h.url('register'))}
                 %endif
                 <span class="buttons">

kallithea/templates/password_reset.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 <%block name="title">
     ${_('Password Reset')}
 </%block>
 <div id="register">
     <%include file="/base/flash_msg.html"/>
     <div class="panel-heading withlogo">
         %if c.site_name:
             <h5>${_('Reset Your Password to %s') % c.site_name}</h5>
         %else:
             <h5>${_('Reset Your Password')}</h5>
         %endif
     </div>
     <div class="inner">
         ${h.form(url('password_reset'))}
         <div class="form">
             <!-- fields -->
             <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label" for="email">${_('Email Address')}:</label>
-                    <div class="input">
                     <div>
                         ${h.text('email')}
                     </div>
                 </div>
                 %if c.captcha_active:
                 <div class="form-group">
                     <label class="control-label" for="recaptcha_field">${_('Captcha')}:</label>
-                    <div class="input">
                     <div>
                         ${h.hidden('recaptcha_field')}
                         <div id="recaptcha"></div>
                     </div>
                 </div>
                 %endif
                 <div class="buttons">
                     <div class="nohighlight">
                       ${h.submit('send',_('Send Password Reset Email'),class_="btn btn-default")}
                     </div>
                 </div>
                 <div class="alert alert-info">
                     ${_('A password reset link will be sent to the specified email address if it is registered in the system.')}
                 </div>
             </div>
         </div>
         ${h.end_form()}
         %if c.captcha_active:
         <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
         %endif
         <script type="text/javascript">
          $(document).ready(function(){
             $('#email').focus();

kallithea/templates/password_reset_confirmation.html

➞

Show inline comments

@@ @@ -6,55 +6,55 @@ @@
 </%block>
 <div id="register">
     <%include file="/base/flash_msg.html"/>
     <div class="panel-heading withlogo">
         %if c.site_name:
             <h5>${_('Reset Your Password to %s') % c.site_name}</h5>
         %else:
             <h5>${_('Reset Your Password')}</h5>
         %endif
     </div>
     <div class="inner">
         ${h.form(h.url('reset_password_confirmation'), method='post')}
         <p>${_('You are about to set a new password for the email address %s.') % c.email}</p>
         <p>${_('Note that you must use the same browser session for this as the one used to request the password reset.')}</p>
         <div style="display: none;">
             ${h.hidden('email')}
             ${h.hidden('timestamp')}
         </div>
         <div class="form">
             <!-- fields -->
             <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label" for="token">${_('Code you received in the email')}:</label>
-                    <div class="input">
                     <div>
                         ${h.text('token', class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="password">${_('New Password')}:</label>
-                    <div class="input">
                     <div>
                         ${h.password('password',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="password_confirm">${_('Confirm New Password')}:</label>
-                    <div class="input">
                     <div>
                         ${h.password('password_confirm',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="buttons">
                         <div class="nohighlight">
                             ${h.submit('send',_('Confirm'),class_="btn btn-default")}
                         </div>
                     </div>
                 </div>
             </div>
         </div>
         ${h.end_form()}
     </div>
    </div>

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -7,63 +7,63 @@ @@
 <%def name="breadcrumbs_links()">
     ${_('New Pull Request')}
 </%def>
 <%block name="header_menu">
     ${self.menu('repositories')}
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('showpullrequest')}
 <div class="panel panel-primary">
     <!-- box / title -->
     <div class="panel-heading clearfix">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
     <div class="form">
         <!-- fields -->
         <div class="form-horizontal" style="float:left;width:50%;padding-right:30px;">
             <div class="form-group">
                 <label class="control-label" for="pullrequest_title">${_('Title')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('pullrequest_title',class_='form-control',placeholder=_('Summarize the changes - or leave empty'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label" for="pullrequest_desc">${_('Description')}:</label>
                 <div class="textarea text-area editor">
                     ${h.textarea('pullrequest_desc',size=30,placeholder=_('Write a short description on this pull request'))}
                 </div>
             </div>
             <div class="form-group">
                 <label class="control-label">${_('Changeset flow')}:</label>
-                <div class="input">
                 <div>
                     ##ORG
                     <div>
                         <div>
                             <div style="padding:5px 3px 3px 3px;">
                             <b>${_('Origin repository')}:</b> <span id="org_repo_desc">${c.db_repo.description.split('\n')[0]}</span>
                             </div>
                             <div>
                             ${h.select('org_repo','',c.cs_repos,class_='refs')}:${h.select('org_ref',c.default_cs_ref,c.cs_refs,class_='refs')}
                             </div>
                             <div style="padding:5px 3px 3px 3px;">
                             <b>${_('Revision')}:</b> <span id="org_rev_span">-</span>
                             </div>
                         </div>
                     </div>
                     ##OTHER, most Probably the PARENT OF THIS FORK
                     <div style="border-top: 1px solid #EEE; margin: 5px 0px 0px 0px">
                         <div>
                             ## filled with JS
                             <div style="padding:5px 3px 3px 3px;">
                             <b>${_('Destination repository')}:</b> <span id="other_repo_desc">${c.a_repo.description.split('\n')[0]}</span>
                             </div>
                             <div>
                             ${h.select('other_repo',c.a_repo.repo_name,c.a_repos,class_='refs')}:${h.select('other_ref',c.default_a_ref,c.a_refs,class_='refs')}

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -19,159 +19,159 @@ @@
 ${self.repo_context_bar('showpullrequest')}
 <div class="panel panel-primary">
   <!-- box / title -->
   <div class="panel-heading">
     ${self.breadcrumbs()}
   </div>
   ${h.form(url('pullrequest_post', repo_name=c.repo_name, pull_request_id=c.pull_request.pull_request_id), method='post', id='pull_request_form')}
     <div class="form pr-box" style="float: left">
       <div class="pr-details-title ${'closed' if c.pull_request.is_closed() else ''}">
           ${_('Title')}: ${c.pull_request.title}
           %if c.pull_request.is_closed():
               (${_('Closed')})
           %endif
       </div>
       <div id="pr-summary" class="fields">
         <div class="pr-not-edit" style="min-height:37px">
             <label>${_('Description')}:</label>
             %if editable:
             <div style="margin: 25px 5px; position: absolute">
               <a class="btn btn-default btn-xs" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>
             </div>
             %endif
-          <div class="input">
           <div>
             <div class="formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>
           </div>
         </div>
         %if editable:
         <div class="pr-do-edit" style="display:none">
           <div>
               <label for="pullrequest_title">${_('Title')}:</label>
-              <div class="input">
               <div>
                   ${h.text('pullrequest_title',class_='form-control',value=c.pull_request.title,placeholder=_('Summarize the changes'))}
               </div>
           </div>
           <div>
               <label for="pullrequest_desc">${_('Description')}:</label>
               <div class="textarea text-area editor">
                   ${h.textarea('pullrequest_desc',size=30,content=c.pull_request.description,placeholder=_('Write a short description on this pull request'))}
               </div>
           </div>
         </div>
         %endif
         <div>
           <label>${_('Reviewer voting result')}:</label>
-          <div class="input">
           <div>
             <div class="changeset-status-container" style="float:none;clear:both">
             %if c.current_voting_result:
               <span class="changeset-status-ico" style="padding:0px 4px 0px 0px">
                   <i class="icon-circle changeset-status-${c.current_voting_result}" title="${_('Pull request status calculated from votes')}"></i></span>
               <span class="changeset-status-lbl" data-toggle="tooltip" title="${_('Pull request status calculated from votes')}">
                 %if c.pull_request.is_closed():
                     ${_('Closed')},
                 %endif
                 ${h.changeset_status_lbl(c.current_voting_result)}
               </span>
             %endif
             </div>
           </div>
         </div>
         <div>
           <label>${_('Still not reviewed by')}:</label>
-          <div class="input">
           <div>
             % if len(c.pull_request_pending_reviewers) > 0:
                 <div data-toggle="tooltip" title="${', '.join([x.username for x in c.pull_request_pending_reviewers])}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>
             % elif len(c.pull_request_reviewers) > 0:
                 <div>${_('Pull request was reviewed by all reviewers')}</div>
             %else:
                 <div>${_('There are no reviewers')}</div>
             %endif
           </div>
         </div>
         <div>
           <label>${_('Origin')}:</label>
-          <div class="input">
           <div>
             <div>
               ${h.link_to_ref(c.pull_request.org_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)}
               %if c.cs_ref_type != 'branch':
                 ${_('on')} ${h.link_to_ref(c.pull_request.org_repo.repo_name, 'branch', c.cs_branch_name)}
               %endif
             </div>
           </div>
         </div>
         <div>
           <label>${_('Target')}:</label>
-          <div class="input">
           <div>
             %if c.is_range:
               ${_("This is just a range of changesets and doesn't have a target or a real merge ancestor.")}
             %else:
               ${h.link_to_ref(c.pull_request.other_repo.repo_name, c.a_ref_type, c.a_ref_name)}
               ## we don't know other rev - c.a_rev is ancestor and not necessarily on other_name_branch branch
             %endif
           </div>
         </div>
         <div>
           <label>${_('Pull changes')}:</label>
-          <div class="input">
           <div>
             %if c.cs_ranges:
               <div>
                ## TODO: use cs_ranges[-1] or org_ref_parts[1] in both cases?
                %if h.is_hg(c.pull_request.org_repo):
                  <span style="font-family: monospace">hg pull ${c.pull_request.org_repo.clone_url()} -r ${h.short_id(c.cs_ranges[-1].raw_id)}</span>
                %elif h.is_git(c.pull_request.org_repo):
                  <span style="font-family: monospace">git pull ${c.pull_request.org_repo.clone_url()} ${c.pull_request.org_ref_parts[1]}</span>
                %endif
               </div>
             %endif
           </div>
         </div>
         <div>
           <label>${_('Created on')}:</label>
-          <div class="input">
           <div>
               <div>${h.fmt_date(c.pull_request.created_on)}</div>
           </div>
         </div>
         <div>
           <label>${_('Owner')}:</label>
-          <div class="input pr-not-edit">
           <div class="pr-not-edit">
                   ${h.gravatar_div(c.pull_request.owner.email, size=20)}
                   <span>${c.pull_request.owner.full_name_and_username}</span><br/>
                   <span><a href="mailto:${c.pull_request.owner.email}">${c.pull_request.owner.email}</a></span><br/>
           </div>
-          <div class="input pr-do-edit ac" style="display:none">
           <div class="pr-do-edit ac" style="display:none">
                ${h.text('owner', class_='form-control', value=c.pull_request.owner.username, placeholder=_('Username'))}
                <div id="owner_completion_container"></div>
           </div>
         </div>
         <div>
           <label>${_('Next iteration')}:</label>
-            <div class="input">
             <div>
               <div class="msg-div">${c.update_msg}</div>
               %if c.avail_revs:
               <div id="updaterevs" style="max-height:200px; overflow-y:auto; overflow-x:hidden; margin-bottom: 10px; padding: 1px 0">
                 <div style="height:0;width:40px">
                   <canvas id="avail_graph_canvas" style="width:0"></canvas>
                 </div>
                 <table id="updaterevs-table" class="noborder" style="padding-left:50px">
                   %for cnt, cs in enumerate(c.avail_cs):
                     <tr id="chg_available_${cnt+1}" class="${'mergerow' if len(cs.parents) > 1 and not (editable and cs.revision in c.avail_revs) else ''}">
                       %if c.cs_ranges and cs.revision == c.cs_ranges[-1].revision:
                         <td>
                           %if editable:
                             ${h.radio(name='updaterev', value='', checked=True)}
                           %endif
                         </td>
                         <td colspan="4">${_("Current revision - no change")}</td>
                       %else:
                         <td>
                           %if editable and cs.revision in c.avail_revs:
                             ${h.radio(name='updaterev', value=cs.raw_id)}
                           %endif
                         </td>
                         <td style="width: 120px"><span data-toggle="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id), class_='changeset_hash')}</td>

kallithea/templates/register.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="base/root.html"/>
 <%block name="title">
     ${_('Sign Up')}
 </%block>
 <div id="register">
     <%include file="/base/flash_msg.html"/>
     <div class="panel-heading withlogo">
         %if c.site_name:
             <h5>${_('Sign Up to %s') % c.site_name}</h5>
         %else:
             <h5>${_('Sign Up')}</h5>
         %endif
     </div>
     <div class="inner">
         ${h.form(url('register'))}
         <div class="form">
             <!-- fields -->
             <div class="form-horizontal">
                 <div class="form-group">
                     <label class="control-label" for="username">${_('Username')}:</label>
-                    <div class="input">
                     <div>
                         ${h.text('username',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="password">${_('Password')}:</label>
-                    <div class="input">
                     <div>
                         ${h.password('password',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="password_confirmation">${_('Re-enter password')}:</label>
-                    <div class="input">
                     <div>
                         ${h.password('password_confirmation',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="firstname">${_('First Name')}:</label>
-                    <div class="input">
                     <div>
                         ${h.text('firstname',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="lastname">${_('Last Name')}:</label>
-                    <div class="input">
                     <div>
                         ${h.text('lastname',class_='form-control')}
                     </div>
                 </div>
                 <div class="form-group">
                     <label class="control-label" for="email">${_('Email')}:</label>
-                    <div class="input">
                     <div>
                         ${h.text('email',class_='form-control')}
                     </div>
                 </div>
                 %if c.captcha_active:
                 <div class="form-group">
                     <label class="control-label" for="recaptcha_field">${_('Captcha')}:</label>
-                    <div class="input">
                     <div>
                         ${h.hidden('recaptcha_field')}
                         <div id="recaptcha"></div>
                     </div>
                 </div>
                 %endif
                 <div class="buttons">
                     <div class="nohighlight">
                         ${h.submit('sign_up',_('Sign Up'),class_="btn btn-default")}
                         %if c.auto_active:
                             <div class="activation_msg">${_('Registered accounts are ready to use and need no further action.')}</div>
                         %else:
                             <div class="activation_msg">${_('Please wait for an administrator to activate your account.')}</div>
                         %endif
                     </div>
                 </div>
             </div>
         </div>
         ${h.end_form()}
         %if c.captcha_active:
         <script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
         %endif
         <script type="text/javascript">
         $(document).ready(function(){

kallithea/templates/search/search.html

➞

Show inline comments

@@ @@ -26,49 +26,49 @@ @@
     ${self.menu('repositories')}
     %else:
     ${self.menu('search')}
     %endif
 </%block>
 <%def name="main()">
 %if c.repo_name:
 ${self.repo_context_bar('options')}
 %endif
 <div class="panel panel-primary">
     <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     %if c.repo_name:
         ${h.form(h.url('search_repo',repo_name=c.repo_name),method='get')}
     %else:
         ${h.form(h.url('search'),method='get')}
     %endif
     <div class="form">
         <div class="form-horizontal">
             <div class="form-group">
                 <label class="control-label" for="q">${_('Search term')}:</label>
-                <div class="input">
                 <div>
                     ${h.text('q',c.cur_query,class_='form-control')}
                 </div>
             </div>
             <div class="form-group">
                 <label for="type">${_('Search in')}:</label>
                 <div class="select">
                     ${h.select('type',c.cur_type,[('content',_('File contents')),
                         ('commit',_('Commit messages')),
                         ('path',_('File names')),
                         ##('repository',_('Repository names')),
                         ])}
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     <input type="submit" value="${_('Search')}" class="btn btn-default"/>
                 </div>
             </div>
             <div class="form-group">
                 ## <label>${_('Status')}:</label>
                 <div style="font-weight: bold;clear:both">${c.runtime}</div>

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -48,79 +48,79 @@ @@
+    }
+  }
   redirect_hash_branch();
   window.onhashchange = function() {
     redirect_hash_branch();
   };
   </script>
 </%block>
 <%def name="main()">
 ${self.repo_context_bar('summary')}
 <%
 summary = lambda n:{False:'summary-short'}.get(n)
 %>
 <div class="panel panel-primary">
     <!-- box / title -->
     <div class="panel-heading">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="form">
         <div id="summary" class="form-horizontal">
             <div class="form-group clearfix">
               <label>${_('Clone URL')}:</label>
-                <div class="input ${summary(c.show_stats)}">
                 <div class="${summary(c.show_stats)}">
                   ${self.repotag(c.db_repo)}
                   <input style="width:80%" type="text" id="clone_url" readonly="readonly" value="${c.clone_repo_url}"/>
                   <input style="display:none;width:80%" type="text" id="clone_url_id" readonly="readonly" value="${c.clone_repo_url_id}"/>
                   <div style="display:none" id="clone_by_name" class="btn btn-default btn-sm">${_('Show by Name')}</div>
                   <div id="clone_by_id" class="btn btn-default btn-sm">${_('Show by ID')}</div>
                 </div>
             </div>
             <div class="form-group clearfix">
               <label>${_('Description')}:</label>
-              <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(c.db_repo.description, stylize=c.visual.stylify_metatags)}</div>
               <div class="${summary(c.show_stats)} desc">${h.urlify_text(c.db_repo.description, stylize=c.visual.stylify_metatags)}</div>
             </div>
             <div class="form-group clearfix">
               <label>${_('Trending files')}:</label>
-              <div class="input ${summary(c.show_stats)}">
               <div class="${summary(c.show_stats)}">
                 %if c.show_stats:
                 <div id="lang_stats"></div>
                 %else:
                    ${_('Statistics are disabled for this repository')}
                    %if h.HasPermissionAny('hg.admin')('enable stats on from summary'):
                         ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_statistics'),class_="btn btn-default btn-xs")}
                    %endif
                 %endif
               </div>
             </div>
             <div class="form-group clearfix">
               <label>${_('Download')}:</label>
-              <div class="input ${summary(c.show_stats)}">
               <div class="${summary(c.show_stats)}">
                 %if len(c.db_repo_scm_instance.revisions) == 0:
                   ${_('There are no downloads yet')}
                 %elif not c.enable_downloads:
                   ${_('Downloads are disabled for this repository')}
                     %if h.HasPermissionAny('hg.admin')('enable downloads on from summary'):
                         ${h.link_to(_('Enable'),h.url('edit_repo',repo_name=c.repo_name, anchor='repo_enable_downloads'),class_="btn btn-default btn-xs")}
                     %endif
                 %else:
                     <span id="${'zip_link'}">
                         <a class="btn btn-default btn-sm" href="${h.url('files_archive_home',repo_name=c.db_repo.repo_name,fname='tip.zip')}"><i class="icon-file-zip"></i> ${_('Download as zip')}</a>
                     </span>
                     ${h.hidden('download_options')}
                     <span style="vertical-align: bottom">
                       <input id="archive_subrepos" type="checkbox" name="subrepos" />
                       <label for="archive_subrepos" data-toggle="tooltip" title="${_('Check this to download archive with subrepos')}" >${_('With subrepos')}</label>
                     </span>
                 %endif
               </div>
             </div>
         </div>
         <div id="summary-menu-stats">
           <ul>
             <li>
                <a title="${_('Owner')} ${c.db_repo.owner.email}">

0 comments (0 inline, 0 general)