kallithea Changeset - d1923cd0521c

@@ @@ -836,41 +836,25 @@ div.header img { @@
     padding: 0;
+}
 #content div.panel div.form div.fields div.field div.label,
 #content div.panel div.form div.form-horizontal div.form-group div.label {
     left: 70px;
     width: 155px;
     position: absolute;
 #content div.panel div.form div.fields div.field > p,
 #content div.panel div.form div.form-horizontal div.form-group > label {
     margin: 0;
     padding: 5px 0 0 0px;
+}
 #content div.panel div.form div.fields div.field div.label-summary,
 #content div.panel div.form div.form-horizontal div.form-group div.label-summary {
     left: 30px;
+}
 #content div.panel div.form div.fields div.field > label,
 #content div.panel div.form div.form-horizontal div.form-group > label {
     width: 155px;
     position: absolute;
     margin: 0;
     padding: 0px 0 0 0px;
+}
 #content div.panel div.form div.fields div.field div.label-select,
 #content div.panel div.form div.form-horizontal div.form-group div.label-select {
     padding: 5px 0 0 5px;
+}
 #content div.panel div.form div.fields div.field div.label label,
 #content div.panel div.form div.form-horizontal div.form-group div.label label,
 div.label label {
 #content div.panel div.form div.fields div.field > label,
 #content div.panel div.form div.form-horizontal div.form-group > label {
     color: #393939;
     font-weight: 700;
+}
 #content div.panel div.form div.fields div.field div.label label,
 #content div.panel div.form div.form-horizontal div.form-group div.label label,
 div.label-summary label {
     color: #393939;
     font-weight: 700;
+}
 #content div.panel div.form div.fields div.field div.input,
 #content div.panel div.form div.form-horizontal div.form-group div.input {
     margin: 0 0 0 200px;
@@ @@ -1658,8 +1642,8 @@ a.metatag[tag="license"]:hover { @@
     padding: 5px;
+}
 #quick_login div.form div.fields div.field div.label label,
 #quick_login div.form div.form-horizontal div.form-group div.label label {
 #quick_login div.form div.fields div.field > label,
 #quick_login div.form div.form-horizontal div.form-group > label {
     color: #fff;
     padding-bottom: 3px;
+}
@@ @@ -1737,8 +1721,8 @@ a.metatag[tag="license"]:hover { @@
     padding: 20px;
+}
 #register div.form div.fields div.field div.label,
 #register div.form div.form-horizontal div.form-group div.label {
 #register div.form div.fields div.field > label,
 #register div.form div.form-horizontal div.form-group > label {
     width: 135px;
     float: left;
     text-align: right;
@@ @@ -3343,18 +3327,6 @@ div#legend_data, div#legend_container, d @@
     padding: 0;
+}
 #content div.panel div.form div.fields div.field div.label span,
 #content div.panel div.form div.form-horizontal div.form-group div.label span,
 #login div.form div.form-horizontal div.form-group div.label span,
 #register div.form div.fields div.field div.label span,
 #register div.form div.form-horizontal div.form-group div.label span {
     height: 1%;
     display: block;
     color: #363636;
     margin: 0;
     padding: 2px 0 0;
+}
 #content div.panel div.form div.fields div.field div.input input.error,
 #content div.panel div.form div.form-horizontal div.form-group div.input input.error,
 #login div.form div.form-horizontal div.form-group div.input input.error,
@@ @@ -3564,8 +3536,8 @@ div.form div.form-horizontal div.buttons @@
+}
 #login div.form div.form-horizontal div.form-group label,
 #register div.form div.fields div.field div.label label,
 #register div.form div.form-horizontal div.form-group div.label label {
 #register div.form div.fields div.field > label,
 #register div.form div.form-horizontal div.form-group > label {
     color: #000;
     font-weight: 700;
+}

kallithea/templates/admin/auth/auth_settings.html

➞

Show inline comments

@@ @@ -28,7 +28,7 @@ @@
     <h1>${_('Authentication Plugins')}</h1>
     <div class="form-horizontal">
        <div class="form-group">
-           <div class="label"><label class="control-label" for="auth_plugins">${_("Enabled Plugins")}</label></div>
            <label class="control-label" for="auth_plugins">${_("Enabled Plugins")}</label>
            <div class="input">${h.text("auth_plugins", class_='large')}
            <span class="help-block">${_('Comma-separated list of plugins; Kallithea will try user authentication in plugin order')}</span>
                <div style="padding:10px 0px 10px 0px;font-weight: bold">${_('Available built-in plugins')}</div>
@@ @@ -58,7 +58,7 @@ @@
             <% displayname = (setting["formname"] if ("formname" in setting) else setting["name"]) %>
             %if setting["type"] == "password":
             <div class="form-group">
-                <div class="label"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div>
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div class="input">
                     ${h.password(fullsetting,class_='small')}
                     <span class="help-block">${setting["description"]}</span>
@@ @@ -66,7 +66,7 @@ @@
             </div>
             %elif setting["type"] in ["string", "int"]:
             <div class="form-group">
-                <div class="label"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div>
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div class="input">
                     ${h.text(fullsetting,class_='small')}
                     <span class="help-block">${setting["description"]}</span>
@@ @@ -74,7 +74,7 @@ @@
             </div>
             %elif setting["type"] == "bool":
             <div class="form-group">
-                <div class="label label-checkbox"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div>
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div class="checkboxes">
                     <div class="checkbox">${h.checkbox(fullsetting,True,class_='small')}</div>
                     <span class="help-block">${setting["description"]}</span>
@@ @@ -82,7 +82,7 @@ @@
             </div>
             %elif setting["type"] == "select":
             <div class="form-group">
-                <div class="label"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div>
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div class="select">
                     ${h.select(fullsetting,setting['values'][0],setting['values'],class_='small')}
                     <span class="help-block">${setting["description"]}</span>
@@ @@ -90,7 +90,7 @@ @@
             </div>
             %else:
             <div class="form-group">
-                <div class="label"><label class="control-label" for="${fullsetting}">${_(displayname)}</label></div>
                 <label class="control-label" for="${fullsetting}">${_(displayname)}</label>
                 <div class="input">This field is of type ${setting['type']}, which cannot be displayed. Must be one of [string|int|bool|select].</div>
                 <span class="help-block">${setting["description"]}</span>
             </div>

kallithea/templates/admin/defaults/defaults.html

➞

Show inline comments

@@ @@ -29,18 +29,14 @@ @@
         <div class="form-horizontal">
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="default_repo_type">${_('Type')}:</label>
                 </div>
                 <div class="input">
                     ${h.select('default_repo_type','hg',c.backends,class_="medium")}
                 </div>
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="default_repo_private">${_('Private repository')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('default_repo_private',value="True")}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
@@ @@ -49,9 +45,7 @@ @@
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="default_repo_enable_statistics">${_('Enable statistics')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('default_repo_enable_statistics',value="True")}
                     <span class="help-block">${_('Enable statistics window on summary page.')}</span>
@@ @@ -59,9 +53,7 @@ @@
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="default_repo_enable_downloads">${_('Enable downloads')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('default_repo_enable_downloads',value="True")}
                     <span class="help-block">${_('Enable download menu on summary page.')}</span>
@@ @@ -69,9 +61,7 @@ @@
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="default_repo_enable_locking">${_('Enable locking')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('default_repo_enable_locking',value="True")}
                     <span class="help-block">${_('Enable lock-by-pulling on repository.')}</span>

kallithea/templates/admin/my_account/my_account_api_keys.html

➞

Show inline comments

@@ @@ -57,9 +57,7 @@ @@
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <div class="label">
                     <label for="description">${_('New API key')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('description', class_='medium', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}

kallithea/templates/admin/my_account/my_account_emails.html

➞

Show inline comments

@@ @@ -38,9 +38,7 @@ @@
         <!-- fields -->
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="new_email">${_('New email address')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('new_email', class_='medium')}
                 </div>

kallithea/templates/admin/my_account/my_account_password.html

➞

Show inline comments

@@ @@ -6,27 +6,21 @@ ${h.form(url('my_account_password'), met @@
 <div class="form">
   <div class="form-horizontal">
     <div class="form-group">
         <div class="label">
             <label class="control-label" for="current_password">${_('Current password')}:</label>
         </div>
         <div class="input">
             ${h.password('current_password',class_='medium')}
         </div>
     </div>
     <div class="form-group">
         <div class="label">
             <label class="control-label" for="new_password">${_('New password')}:</label>
         </div>
         <div class="input">
             ${h.password('new_password',class_='medium')}
         </div>
     </div>
     <div class="form-group">
         <div class="label">
             <label class="control-label" for="new_password_confirmation">${_('Confirm new password')}:</label>
         </div>
         <div class="input">
             ${h.password('new_password_confirmation',class_='medium')}
         </div>

kallithea/templates/admin/my_account/my_account_profile.html

➞

Show inline comments

@@ @@ -19,36 +19,28 @@ ${h.form(url('my_account'), method='post @@
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="username">${_('Username')}:</label>
                 </div>
                 <div class="input">
                   ${h.text('username',class_='medium', readonly=c.readonly('username'))}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="name">${_('First Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('firstname',class_="medium", readonly=c.readonly('firstname'))}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="lastname">${_('Last Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('lastname',class_="medium", readonly=c.readonly('lastname'))}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="email">${_('Email')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('email',class_="medium", readonly=c.readonly('email'))}
                 </div>

kallithea/templates/admin/permissions/permissions_globals.html

➞

Show inline comments

@@ @@ -3,9 +3,7 @@ ${h.form(url('admin_permissions'), metho @@
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="anonymous">${_('Anonymous access')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('anonymous',True)}
@@ @@ -14,9 +12,7 @@ ${h.form(url('admin_permissions'), metho @@
                 </div>
             </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="default_repo_perm">${_('Repository')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('default_repo_perm','',c.repo_perms_choices)}
                     ${h.checkbox('overwrite_default_repo','true')}
@@ @@ -28,9 +24,7 @@ ${h.form(url('admin_permissions'), metho @@
                 </div>
             </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="default_group_perm">${_('Repository group')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('default_group_perm','',c.group_perms_choices)}
                     ${h.checkbox('overwrite_default_group','true')}
@@ @@ -42,9 +36,7 @@ ${h.form(url('admin_permissions'), metho @@
                 </div>
             </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="default_group_perm">${_('User group')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('default_user_group_perm','',c.user_group_perms_choices)}
                     ${h.checkbox('overwrite_default_user_group','true')}
@@ @@ -56,9 +48,7 @@ ${h.form(url('admin_permissions'), metho @@
                 </div>
             </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="default_repo_create">${_('Top level repository creation')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('default_repo_create','',c.repo_create_choices)}
                     <span class="help-block">${_('Enable this to allow non-admins to create repositories at the top level.')}</span>
@@ @@ -66,44 +56,34 @@ ${h.form(url('admin_permissions'), metho @@
                 </div>
              </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="create_on_write">${_('Repository creation with group write access')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('create_on_write','',c.repo_create_on_write_choices)}
                     <span class="help-block">${_('With this, write permission to a repository group allows creating repositories inside that group. Without this, group write permissions mean nothing.')}</span>
                 </div>
             </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="default_user_group_create">${_('User group creation')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('default_user_group_create','',c.user_group_create_choices)}
                     <span class="help-block">${_('Enable this to allow non-admins to create user groups.')}</span>
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="default_fork">${_('Repository forking')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('default_fork','',c.fork_choices)}
                     <span class="help-block">${_('Enable this to allow non-admins to fork repositories.')}</span>
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="default_register">${_('Registration')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('default_register','',c.register_choices)}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="default_extern_activate">${_('External auth account activation')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('default_extern_activate','',c.extern_activate_choices)}
                 </div>

kallithea/templates/admin/permissions/permissions_ips.html

➞

Show inline comments

@@ @@ -26,9 +26,7 @@ ${h.form(url('edit_user_ips_update', id= @@
         <!-- fields -->
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="new_ip">${_('New IP address')}:</label>
                 </div>
                 <div class="input">
                     ${h.hidden('default_user', 'True')}
                     ${h.text('new_ip', class_='medium')}

kallithea/templates/admin/repo_groups/repo_group_add.html

➞

Show inline comments

@@ @@ -29,36 +29,28 @@ @@
         <!-- fields -->
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="group_name">${_('Group name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('group_name',class_='small')}
                 </div>
              </div>
             <div class="form-group">
                 <div class="label label-textarea">
                     <label class="control-label" for="group_description">${_('Description')}:</label>
                 </div>
                 <div class="textarea-repo editor">
                     ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
                 </div>
             </div>
             <div class="form-group">
                  <div class="label">
                      <label class="control-label" for="group_parent_id">${_('Group parent')}:</label>
                  </div>
                  <div class="input">
                      ${h.select('group_parent_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
                  </div>
             </div>
             <div id="copy_perms" class="field">
                 <div class="label label-checkbox">
                     <label class="control-label" for="group_copy_permissions">${_('Copy parent group permissions')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('group_copy_permissions',value="True")}
                     <span class="help-block">${_('Copy permission set from parent repository group.')}</span>

kallithea/templates/admin/repo_groups/repo_group_edit_settings.html

➞

Show inline comments

@@ @@ -4,36 +4,28 @@ ${h.form(url('update_repos_group',group_ @@
     <!-- fields -->
     <div class="form-horizontal">
         <div class="form-group">
             <div class="label">
                 <label class="control-label" for="group_name">${_('Group name')}:</label>
             </div>
             <div class="input">
                 ${h.text('group_name',class_='medium')}
             </div>
         </div>
         <div class="form-group">
             <div class="label label-textarea">
                 <label class="control-label" for="group_description">${_('Description')}:</label>
             </div>
             <div class="textarea text-area editor">
                 ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
             </div>
         </div>
         <div class="form-group">
             <div class="label">
                 <label class="control-label" for="group_parent_id">${_('Group parent')}:</label>
             </div>
             <div class="input">
                 ${h.select('group_parent_id','',c.repo_groups,class_="medium")}
             </div>
         </div>
         <div class="form-group">
             <div class="label label-checkbox">
                 <label class="control-label" for="enable_locking">${_('Enable locking')}:</label>
             </div>
             <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>

kallithea/templates/admin/repos/repo_add_base.html

➞

Show inline comments

@@ @@ -5,17 +5,13 @@ ${h.form(url('repos'))} @@
     <!-- fields -->
     <div class="form-horizontal">
         <div class="form-group">
             <div class="label">
                 <label class="control-label" for="repo_name">${_('Name')}:</label>
             </div>
             <div class="input">
                 ${h.text('repo_name',class_="small")}
             </div>
          </div>
         <div id="remote_clone" class="field">
             <div class="label">
                 <label class="control-label" for="clone_uri">${_('Clone remote repository')}:</label>
             </div>
             <div class="input">
                 ${h.text('clone_uri',class_="small")}
                 <span class="help-block">
@@ @@ -24,54 +20,42 @@ ${h.form(url('repos'))} @@
             </div>
         </div>
         <div class="form-group">
             <div class="label label-textarea">
                 <label class="control-label" for="repo_description">${_('Description')}:</label>
             </div>
             <div class="textarea-repo editor">
                 ${h.textarea('repo_description')}
                 <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
             </div>
         </div>
         <div class="form-group">
              <div class="label">
                  <label class="control-label" for="repo_group">${_('Repository group')}:</label>
              </div>
              <div class="input">
                  ${h.select('repo_group',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
                  <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
              </div>
         </div>
         <div id="copy_perms" class="field">
             <div class="label label-checkbox">
                 <label class="control-label" for="repo_copy_permissions">${_('Copy parent group permissions')}:</label>
             </div>
             <div class="checkboxes">
                 ${h.checkbox('repo_copy_permissions',value="True")}
                 <span class="help-block">${_('Copy permission set from parent repository group.')}</span>
             </div>
         </div>
         <div class="form-group">
             <div class="label">
                 <label class="control-label" for="repo_type">${_('Type')}:</label>
             </div>
             <div class="input">
                 ${h.select('repo_type','hg',c.backends,class_="small")}
                 <span class="help-block">${_('Type of repository to create.')}</span>
             </div>
         </div>
         <div class="form-group">
             <div class="label">
                 <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label>
             </div>
             <div class="input">
                 ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")}
                 <span class="help-block">${_('Default revision for files page, downloads, full text search index and readme generation')}</span>
             </div>
         </div>
         <div class="form-group">
             <div class="label label-checkbox">
                 <label class="control-label" for="repo_private">${_('Private repository')}:</label>
             </div>
             <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>

kallithea/templates/admin/repos/repo_edit_fields.html

➞

Show inline comments

@@ @@ -29,26 +29,20 @@ @@
         <!-- fields -->
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="new_field_key">${_('New field key')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('new_field_key', class_='small')}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="new_field_label">${_('New field label')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('new_field_label', class_='small', placeholder=_('Enter short label'))}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="new_field_desc">${_('New field description')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('new_field_desc', class_='small', placeholder=_('Enter description of a field'))}
                 </div>

kallithea/templates/admin/repos/repo_edit_settings.html

➞

Show inline comments

@@ @@ -3,9 +3,7 @@ ${h.form(url('update_repo', repo_name=c. @@
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="repo_name">${_('Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('repo_name',class_="medium")}
                     <span class="help-block">${_('Permanent Repository ID')}: `_${c.repo_info.repo_id}` <span><a id="show_more_clone_id" href="#">${_('What is that?')}</a></span></span>
@@ @@ -17,9 +15,7 @@ ${h.form(url('update_repo', repo_name=c. @@
                 </div>
             </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="clone_uri">${_('Remote repository')}:</label>
                 </div>
                 <div class="input">
                   <div id="alter_clone_uri">
                         ${h.text('clone_uri',class_="medium", placeholder=_('Repository URL'))}
@@ @@ -31,27 +27,21 @@ ${h.form(url('update_repo', repo_name=c. @@
                 </div>
             </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="repo_group">${_('Repository group')}:</label>
                 </div>
                 <div class="input">
                     ${h.select('repo_group','',c.repo_groups,class_="medium")}
                     <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="repo_landing_rev">${_('Landing revision')}:</label>
                 </div>
                 <div class="input">
                     ${h.select('repo_landing_rev','',c.landing_revs,class_="medium")}
                     <span class="help-block">${_('Default revision for files page, downloads, whoosh and readme')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="owner">${_('Owner')}:</label>
                 </div>
                 <div class="input input-medium ac">
                     <div class="perm_ac">
                        ${h.text('owner',class_='yui-ac-input')}
@@ @@ -61,9 +51,7 @@ ${h.form(url('update_repo', repo_name=c. @@
                 </div>
              </div>
             <div class="form-group">
                 <div class="label label-textarea">
                     <label class="control-label" for="repo_description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('repo_description', style="height:165px")}
                     <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
@@ @@ -71,36 +59,28 @@ ${h.form(url('update_repo', repo_name=c. @@
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="repo_private">${_('Private repository')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('repo_private',value="True")}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="repo_enable_statistics">${_('Enable statistics')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('repo_enable_statistics',value="True")}
                     <span class="help-block">${_('Enable statistics window on summary page.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="repo_enable_downloads">${_('Enable downloads')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('repo_enable_downloads',value="True")}
                     <span class="help-block">${_('Enable download menu on summary page.')}</span>
                 </div>
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="repo_enable_locking">${_('Enable locking')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('repo_enable_locking',value="True")}
                     <span class="help-block">${_('Enable lock-by-pulling on repository.')}</span>
@@ @@ -111,9 +91,7 @@ ${h.form(url('update_repo', repo_name=c. @@
               ## EXTRA FIELDS
               %for field in c.repo_fields:
                 <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="${field.field_key_prefixed}">${field.field_label} (${field.field_key}):</label>
                     </div>
                     <div class="input input-medium">
                         ${h.text(field.field_key_prefixed, field.field_value, class_='medium')}
                         %if field.field_desc:

kallithea/templates/admin/settings/settings_email.html

➞

Show inline comments

@@ @@ -3,9 +3,7 @@ ${h.form(url('admin_settings_email'), me @@
         <div class="form-horizontal">
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="test_email">${_('Send test email to')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('test_email',size=30)}
                 </div>

kallithea/templates/admin/settings/settings_global.html

➞

Show inline comments

@@ @@ -4,9 +4,7 @@ ${h.form(url('admin_settings_global'), m @@
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="title">${_('Site branding')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('title',size=30)}
                     <span class="help-block">${_('Set a custom title for your Kallithea Service.')}</span>
@@ @@ -14,18 +12,14 @@ ${h.form(url('admin_settings_global'), m @@
              </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="realm">${_('HTTP authentication realm')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('realm',size=30)}
                 </div>
             </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="ga_code">${_('HTML/JavaScript/CSS customization block')}:</label>
                 </div>
                 <div class="input">
                     ${h.textarea('ga_code', cols=80, rows=10)}
                     <span class="help-block">${_('HTML (possibly with \
@@ @@ -38,9 +32,7 @@ ${h.form(url('admin_settings_global'), m @@
             </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="captcha_public_key">${_('ReCaptcha public key')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('captcha_public_key',size=60)}
                     <span class="help-block">${_('Public key for reCaptcha system.')}</span>
@@ @@ -48,9 +40,7 @@ ${h.form(url('admin_settings_global'), m @@
             </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="captcha_private_key">${_('ReCaptcha private key')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('captcha_private_key',size=60)}
                     <span class="help-block">${_('Private key for reCaptcha system. Setting this value will enable captcha on registration.')}</span>

kallithea/templates/admin/settings/settings_hooks.html

➞

Show inline comments

@@ @@ -3,9 +3,7 @@ @@
     <div class="form-horizontal">
       % for hook in c.hooks:
         <div class="form-group">
             <div class="label label">
                 <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label>
             </div>
             <div class="input" style="margin-left:280px">
               ${h.text(hook.ui_key,hook.ui_value,size=60,readonly="readonly")}
             </div>
@@ @@ -23,9 +21,7 @@ ${h.form(url('admin_settings_hooks'), me @@
       % for hook in c.custom_hooks:
       <div class="field"  id="${'id%s' % hook.ui_id }">
         <div class="label label">
             <label class="control-label" for="${hook.ui_key}">${hook.ui_key}</label>
         </div>
         <div class="input" style="margin-left:280px">
             ${h.hidden('hook_ui_key',hook.ui_key)}
             ${h.hidden('hook_ui_value',hook.ui_value)}

kallithea/templates/admin/settings/settings_mapping.html

➞

Show inline comments

@@ @@ -2,9 +2,7 @@ ${h.form(url('admin_settings_mapping'), @@
     <div class="form">
         <div class="form-horizontal">
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="destroy">${_('Rescan option')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('destroy',True)}

kallithea/templates/admin/settings/settings_search.html

➞

Show inline comments

@@ @@ -3,9 +3,7 @@ ${h.form(url('admin_settings_search'), m @@
         <div class="form-horizontal">
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label">${_('Index build option')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('full_index',True)}

kallithea/templates/admin/settings/settings_vcs.html

➞

Show inline comments

@@ @@ -2,9 +2,7 @@ ${h.form(url('admin_settings'), method=' @@
     <div class="form">
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label label-checkbox">
                     <label>${_('Hooks')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('hooks_changegroup_repo_size','True')}
@@ @@ -25,9 +23,7 @@ ${h.form(url('admin_settings'), method=' @@
                 </div>
              </div>
              <div class="form-group">
                 <div class="label label-checkbox">
                     <label>${_('Mercurial extensions')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('extensions_largefiles','True')}
@@ @@ -47,9 +43,7 @@ ${h.form(url('admin_settings'), method=' @@
             </div>
             %if c.visual.allow_repo_location_change:
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="paths_root_path">${_('Location of repositories')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('paths_root_path',size=60,readonly="readonly")}
                     <span id="path_unlock" class="tooltip" style="cursor: pointer"

kallithea/templates/admin/settings/settings_visual.html

➞

Show inline comments

@@ @@ -4,9 +4,7 @@ ${h.form(url('admin_settings_visual'), m @@
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label label-checkbox">
                     <label>${_('General')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('repository_fields','True')}
@@ @@ -36,9 +34,7 @@ ${h.form(url('admin_settings_visual'), m @@
                                                         {netloc}    network location/server host of running Kallithea server''')}</span>
                     </div>
                 </div>
                 <div class="label label-checkbox">
                     <label>${_('Clone URL')}:</label>
                 </div>
                 <div class="field">
                     <div class="input">
                         ${h.text('clone_uri_tmpl', size=80)}
@@ @@ -54,9 +50,7 @@ ${h.form(url('admin_settings_visual'), m @@
              </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="dashboard_items">${_('Dashboard items')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('dashboard_items',size=5)}
                     <span class="help-block">${_('Number of items displayed in the main page dashboard before pagination is shown.')}</span>
@@ @@ -64,9 +58,7 @@ ${h.form(url('admin_settings_visual'), m @@
             </div>
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="admin_grid_items">${_('Admin pages items')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('admin_grid_items',size=5)}
                     <span class="help-block">${_('Number of items displayed in the admin pages grids before pagination is shown.')}</span>
@@ @@ -74,9 +66,7 @@ ${h.form(url('admin_settings_visual'), m @@
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label>${_('Icons')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('show_public_icon','True')}
@@ @@ -91,9 +81,7 @@ ${h.form(url('admin_settings_visual'), m @@
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label>${_('Meta Tagging')}:</label>
                 </div>
                 <div class="checkboxes">
                     <div class="checkbox">
                         ${h.checkbox('stylify_metatags','True')}

kallithea/templates/admin/user_groups/user_group_add.html

➞

Show inline comments

@@ @@ -28,26 +28,20 @@ @@
         <!-- fields -->
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="users_group_name">${_('Group name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('users_group_name',class_='small')}
                 </div>
              </div>
             <div class="form-group">
                 <div class="label label-textarea">
                     <label class="control-label" for="user_group_description">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('user_group_description')}
                     <span class="help-block">${_('Short, optional description for this user group.')}</span>
                 </div>
              </div>
              <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="users_group_active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('users_group_active',value=True, checked='checked')}
                 </div>

kallithea/templates/admin/user_groups/user_group_edit_settings.html

➞

Show inline comments

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

kallithea/templates/admin/users/user_add.html

➞

Show inline comments

@@ @@ -28,63 +28,49 @@ @@
         <!-- fields -->
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="username">${_('Username')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('username',class_='small')}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="password">${_('Password')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('password',class_='small')}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="password_confirmation">${_('Password confirmation')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('password_confirmation',class_="small")}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="firstname">${_('First Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('firstname',class_='small')}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="lastname">${_('Last Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('lastname',class_='small')}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="email">${_('Email')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('email',class_='small')}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True,checked='checked')}
                 </div>

kallithea/templates/admin/users/user_edit_api_keys.html

➞

Show inline comments

@@ @@ -57,9 +57,7 @@ @@
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="description">${_('New API key')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('description', class_='medium', placeholder=_('Description'))}
                     ${h.select('lifetime', '', c.lifetime_options)}

kallithea/templates/admin/users/user_edit_emails.html

➞

Show inline comments

@@ @@ -38,9 +38,7 @@ @@
         <!-- fields -->
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="new_email">${_('New email address')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('new_email', class_='medium')}
                 </div>

kallithea/templates/admin/users/user_edit_ips.html

➞

Show inline comments

@@ @@ -38,9 +38,7 @@ @@
         <!-- fields -->
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="new_ip">${_('New IP address')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('new_ip', class_='medium')}
                 </div>

kallithea/templates/admin/users/user_edit_profile.html

➞

Show inline comments

@@ @@ -20,90 +20,70 @@ ${h.form(url('update_user', id=c.user.us @@
         <div class="form-horizontal">
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="username">${_('Username')}:</label>
                 </div>
                 <div class="input">
                   ${h.text('username',class_='medium', readonly=c.readonly('username'))}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="email">${_('Email')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('email',class_='medium', readonly=c.readonly('email'))}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="extern_type">${_('Source of Record')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('extern_type',class_='medium',readonly="readonly")}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="extern_name">${_('Name in Source of Record')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('extern_name',class_='medium',readonly="readonly")}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="new_password">${_('New password')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('new_password',class_='medium',readonly=c.readonly('password'))}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="password_confirmation">${_('New password confirmation')}:</label>
                 </div>
                 <div class="input">
                     ${h.password('password_confirmation',class_="medium",readonly=c.readonly('password'))}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="firstname">${_('First Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('firstname',class_='medium', readonly=c.readonly('firstname'))}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="lastname">${_('Last Name')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('lastname',class_='medium', readonly=c.readonly('lastname'))}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="active">${_('Active')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('active',value=True, readonly=c.readonly('active'))}
                 </div>
              </div>
              <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="admin">${_('Admin')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('admin',value=True, readonly=c.readonly('admin'))}
                 </div>

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -384,18 +384,14 @@ @@
             <div class="form">
                 <div class="fields">
                     <div class="field">
                         <div class="label">
                             <label for="username">${_('Username')}:</label>
                         </div>
                         <div class="input">
                             ${h.text('username',class_='focus')}
                         </div>
                     </div>
                     <div class="field">
                         <div class="label">
                             <label for="password">${_('Password')}:</label>
                         </div>
                         <div class="input">
                             ${h.password('password',class_='focus')}
                         </div>

kallithea/templates/base/default_perms_box.html

➞

Show inline comments

@@ @@ -10,9 +10,7 @@ ${h.form(form_url)} @@
         <!-- fields -->
         <div class="form-horizontal">
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="inherit_default_permissions">${_('Inherit defaults')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('inherit_default_permissions',value=True)}
                     <span class="help-block">
@@ @@ -24,9 +22,7 @@ ${h.form(form_url)} @@
             <div id="inherit_overlay">
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="create_repo_perm">${_('Create repositories')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_repo_perm',value=True)}
                     <span class="help-block">
@@ @@ -36,9 +32,7 @@ ${h.form(form_url)} @@
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="create_user_group_perm">${_('Create user groups')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('create_user_group_perm',value=True)}
                     <span class="help-block">
@@ @@ -48,9 +42,7 @@ ${h.form(form_url)} @@
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="fork_repo_perm">${_('Fork repositories')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('fork_repo_perm',value=True)}
                     <span class="help-block">

kallithea/templates/forks/fork.html

➞

Show inline comments

@@ @@ -23,9 +23,7 @@ ${self.repo_context_bar('createfork')} @@
         <div class="form-horizontal">
             <div class="form-group">
               <div class="label">
                   <label class="control-label" for="repo_name">${_('Fork name')}:</label>
               </div>
               <div class="input">
                   ${h.text('repo_name',class_="small")}
                   ${h.hidden('repo_type',c.repo_info.repo_type)}
@@ @@ -34,9 +32,7 @@ ${self.repo_context_bar('createfork')} @@
             </div>
             <div class="form-group">
                 <div class="label label-textarea">
                     <label class="control-label" for="description">${_('Description')}:</label>
                 </div>
                 <div class="textarea editor">
                     ${h.textarea('description')}
                     <span class="help-block">${_('Keep it short and to the point. Use a README file for longer descriptions.')}</span>
@@ @@ -44,9 +40,7 @@ ${self.repo_context_bar('createfork')} @@
             </div>
             <div class="form-group">
                  <div class="label">
                      <label class="control-label" for="repo_group">${_('Repository group')}:</label>
                  </div>
                  <div class="input">
                      ${h.select('repo_group','',c.repo_groups,class_="medium")}
                      <span class="help-block">${_('Optionally select a group to put this repository into.')}</span>
@@ @@ -54,9 +48,7 @@ ${self.repo_context_bar('createfork')} @@
             </div>
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="landing_rev">${_('Landing revision')}:</label>
                 </div>
                 <div class="input">
                     ${h.select('landing_rev','',c.landing_revs,class_="medium")}
                     <span class="help-block">${_('Default revision for files page, downloads, whoosh, and readme.')}</span>
@@ @@ -64,9 +56,7 @@ ${self.repo_context_bar('createfork')} @@
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="private">${_('Private')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('private',value="True")}
                     <span class="help-block">${_('Private repositories are only visible to people explicitly added as collaborators.')}</span>
@@ @@ -74,9 +64,7 @@ ${self.repo_context_bar('createfork')} @@
             </div>
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="private">${_('Copy permissions')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('copy_permissions',value="True", checked="checked")}
                     <span class="help-block">${_('Copy permissions from forked repository')}</span>
@@ @@ -85,9 +73,7 @@ ${self.repo_context_bar('createfork')} @@
             %if c.can_update:
             <div class="form-group">
                 <div class="label label-checkbox">
                     <label class="control-label" for="private">${_('Update after clone')}:</label>
                 </div>
                 <div class="checkboxes">
                     ${h.checkbox('update_after_clone',value="True")}
                     <span class="help-block">${_('Checkout source after making a clone')}</span>

kallithea/templates/password_reset.html

➞

Show inline comments

@@ @@ -21,9 +21,7 @@ @@
             <div class="form-horizontal">
                  <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="email">${_('Email Address')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('email')}
                     </div>
@@ @@ -31,9 +29,7 @@ @@
                 %if c.captcha_active:
                 <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="email">${_('Captcha')}:</label>
                     </div>
                     <div class="input">
                         ${h.hidden('recaptcha_field')}
                         <div id="recaptcha"></div>

kallithea/templates/password_reset_confirmation.html

➞

Show inline comments

@@ @@ -26,27 +26,21 @@ @@
             <!-- fields -->
             <div class="form-horizontal">
                 <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="token">${_('Code you received in the email')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('token', class_='focus')}
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="password">${_('New Password')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('password',class_='focus')}
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="password_confirm">${_('Confirm New Password')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('password_confirm',class_='focus')}
                     </div>

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -27,27 +27,21 @@ ${self.repo_context_bar('showpullrequest @@
         <div class="form-horizontal" style="float:left;width:50%;padding-right:30px;">
              <div class="form-group">
                 <div class="label">
                     <label class="control-label" for="pullrequest_title">${_('Title')}:</label>
                 </div>
                 <div class="input">
                     ${h.text('pullrequest_title',class_="large",placeholder=_('Summarize the changes - or leave empty'))}
                 </div>
              </div>
             <div class="form-group">
                 <div class="label label-textarea">
                     <label class="control-label" for="pullrequest_desc">${_('Description')}:</label>
                 </div>
                 <div class="textarea text-area editor">
                     ${h.textarea('pullrequest_desc',size=30,placeholder=_('Write a short description on this pull request'))}
                 </div>
             </div>
             <div class="form-group">
                 <div class="label label-textarea">
                     <label class="control-label" for="pullrequest_desc">${_('Changeset flow')}:</label>
                 </div>
                 <div class="input">
                     ##ORG
                     <div>

kallithea/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -34,14 +34,12 @@ ${self.repo_context_bar('showpullrequest @@
       <div id="pr-summary" class="fields">
         <div class="field pr-not-edit" style="min-height:37px">
           <div class="label-summary">
             <label>${_('Description')}:</label>
             %if editable:
             <div style="margin: 5px">
+            <div style="margin: 25px 5px; position: absolute">
               <a class="btn btn-default btn-xs" onclick="$('.pr-do-edit').show();$('.pr-not-edit').hide()">${_("Edit")}</a>
             </div>
             %endif
           </div>
           <div class="input">
             <div class="formatted-fixed">${h.urlify_text(c.pull_request.description, c.pull_request.org_repo.repo_name)}</div>
           </div>
@@ @@ -50,18 +48,14 @@ ${self.repo_context_bar('showpullrequest @@
         %if editable:
         <div class="pr-do-edit" style="display:none">
           <div class="field">
               <div class="label-summary">
                   <label for="pullrequest_title">${_('Title')}:</label>
               </div>
               <div class="input">
                   ${h.text('pullrequest_title',class_="large",value=c.pull_request.title,placeholder=_('Summarize the changes'))}
               </div>
           </div>
           <div class="field">
               <div class="label-summary label-textarea">
                   <label for="pullrequest_desc">${_('Description')}:</label>
               </div>
               <div class="textarea text-area editor">
                   ${h.textarea('pullrequest_desc',size=30,content=c.pull_request.description,placeholder=_('Write a short description on this pull request'))}
               </div>
@@ @@ -70,9 +64,7 @@ ${self.repo_context_bar('showpullrequest @@
         %endif
         <div class="field">
           <div class="label-summary">
               <label>${_('Reviewer voting result')}:</label>
           </div>
           <div class="input">
             <div class="changeset-status-container" style="float:none;clear:both">
             %if c.current_voting_result:
@@ @@ -89,9 +81,7 @@ ${self.repo_context_bar('showpullrequest @@
           </div>
         </div>
         <div class="field">
           <div class="label-summary">
               <label>${_('Still not reviewed by')}:</label>
           </div>
           <div class="input">
             % if len(c.pull_request_pending_reviewers) > 0:
                 <div class="tooltip" title="${', '.join([x.username for x in c.pull_request_pending_reviewers])}">${ungettext('%d reviewer', '%d reviewers',len(c.pull_request_pending_reviewers)) % len(c.pull_request_pending_reviewers)}</div>
@@ @@ -103,9 +93,7 @@ ${self.repo_context_bar('showpullrequest @@
           </div>
         </div>
         <div class="field">
           <div class="label-summary">
               <label>${_('Origin')}:</label>
           </div>
           <div class="input">
             <div>
               ${h.link_to_ref(c.pull_request.org_repo.repo_name, c.cs_ref_type, c.cs_ref_name, c.cs_rev)}
@@ @@ -116,9 +104,7 @@ ${self.repo_context_bar('showpullrequest @@
           </div>
         </div>
         <div class="field">
           <div class="label-summary">
               <label>${_('Target')}:</label>
           </div>
           <div class="input">
             %if c.is_range:
               ${_("This is just a range of changesets and doesn't have a target or a real merge ancestor.")}
@@ @@ -129,9 +115,7 @@ ${self.repo_context_bar('showpullrequest @@
           </div>
         </div>
         <div class="field">
           <div class="label-summary">
               <label>${_('Pull changes')}:</label>
           </div>
           <div class="input">
             %if c.cs_ranges:
               <div>
@@ @@ -146,17 +130,13 @@ ${self.repo_context_bar('showpullrequest @@
           </div>
         </div>
         <div class="field">
           <div class="label-summary">
               <label>${_('Created on')}:</label>
           </div>
           <div class="input">
               <div>${h.fmt_date(c.pull_request.created_on)}</div>
           </div>
         </div>
         <div class="field">
           <div class="label-summary">
               <label>${_('Owner')}:</label>
           </div>
           <div class="input pr-not-edit">
                   ${h.gravatar_div(c.pull_request.owner.email, size=20)}
                   <span>${c.pull_request.owner.full_name_and_username}</span><br/>
@@ @@ -169,9 +149,7 @@ ${self.repo_context_bar('showpullrequest @@
         </div>
         <div class="field">
             <div class="label-summary">
               <label>${_('Next iteration')}:</label>
             </div>
             <div class="input">
               <div class="msg-div">${c.update_msg}</div>
               %if c.avail_revs:

kallithea/templates/register.html

➞

Show inline comments

@@ @@ -20,54 +20,42 @@ @@
             <!-- fields -->
             <div class="form-horizontal">
                 <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="username">${_('Username')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('username',class_="medium")}
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="password">${_('Password')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('password',class_="medium")}
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="password_confirmation">${_('Re-enter password')}:</label>
                     </div>
                     <div class="input">
                         ${h.password('password_confirmation',class_="medium")}
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="firstname">${_('First Name')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('firstname',class_="medium")}
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="lastname">${_('Last Name')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('lastname',class_="medium")}
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="email">${_('Email')}:</label>
                     </div>
                     <div class="input">
                         ${h.text('email',class_="medium")}
                     </div>
@@ @@ -75,9 +63,7 @@ @@
                 %if c.captcha_active:
                 <div class="form-group">
                     <div class="label">
                         <label class="control-label" for="email">${_('Captcha')}:</label>
                     </div>
                     <div class="input">
                         ${h.hidden('recaptcha_field')}
                         <div id="recaptcha"></div>

kallithea/templates/search/search.html

➞

Show inline comments

@@ @@ -46,9 +46,7 @@ ${self.repo_context_bar('options')} @@
     <div class="form">
         <div class="form-horizontal">
             <div class="field field-first field-noborder">
              <div class="label">
                  <label class="control-label" for="q">${_('Search term')}:</label>
              </div>
                 <div class="input">${h.text('q',c.cur_query,class_="small")}
                     <div class="button highlight">
                         <input type="submit" value="${_('Search')}" class="btn btn-default"/>
@@ @@ -58,9 +56,7 @@ ${self.repo_context_bar('options')} @@
             </div>
             <div class="form-group">
                 <div class="label">
                     <label for="type">${_('Search in')}:</label>
                 </div>
                 <div class="select">
                     ${h.select('type',c.cur_type,[('content',_('File contents')),
                         ('commit',_('Commit messages')),

kallithea/templates/summary/summary.html

➞

Show inline comments

@@ @@ -68,9 +68,7 @@ summary = lambda n:{False:'summary-short @@
     <div class="form">
         <div id="summary" class="form-horizontal">
             <div class="form-group">
                 <div class="label-summary">
                   <label>${_('Clone URL')}:</label>
                 </div>
                 <div class="input ${summary(c.show_stats)}">
                   ${self.repotag(c.db_repo)}
                   <input style="width:80%" type="text" id="clone_url" readonly="readonly" value="${c.clone_repo_url}"/>
@@ @@ -81,16 +79,12 @@ summary = lambda n:{False:'summary-short @@
             </div>
             <div class="form-group">
               <div class="label-summary">
                   <label>${_('Description')}:</label>
               </div>
               <div class="input ${summary(c.show_stats)} desc">${h.urlify_text(c.db_repo.description, stylize=c.visual.stylify_metatags)}</div>
             </div>
             <div class="form-group">
               <div class="label-summary">
                   <label>${_('Trending files')}:</label>
               </div>
               <div class="input ${summary(c.show_stats)}">
                 %if c.show_stats:
                 <div id="lang_stats"></div>
@@ @@ -104,9 +98,7 @@ summary = lambda n:{False:'summary-short @@
             </div>
             <div class="form-group">
               <div class="label-summary">
                   <label>${_('Download')}:</label>
               </div>
               <div class="input ${summary(c.show_stats)}">
                 %if len(c.db_repo_scm_instance.revisions) == 0:
                   ${_('There are no downloads yet')}

0 comments (0 inline, 0 general)