Changeset - 5572eb8d4feb
Parent rev.
Child rev.
[Not reviewed]
stable
0 4 0
Mads Kiilerich (mads) - 4 years ago 2022-06-27 20:50:23
mads@kiilerich.com
html: clarify type of button elements - make it clear if we really want "submit"

This might fix some real problems.
4 files changed with 8 insertions and 6 deletions:
kallithea/public/js/base.js
2
kallithea/templates/admin/user_groups/user_group_edit_perms.html
1
1
kallithea/templates/changeset/diff_block.html
1
1
kallithea/templates/data_table/_dt_elements.html
4
4
0 comments (0 inline, 0 general)
kallithea/public/js/base.js
➞
Show inline comments
 
@@ -668,32 +668,34 @@ function _comment_div_append_form($comme
 
        }
 
        function failure(x, s, e) {
 
            $preview.removeClass('submitting').children('.panel').addClass('panel-danger');
 
            var $status = $preview.find('.comment-submission-status');
 
            $('<span>', {
 
                'title': e,
 
                text: _TM['Unable to post']
 
            }).replaceAll($status.contents());
 
            $('<div>', {
 
                'class': 'btn-group'
 
            }).append(
 
                $('<button>', {
 
                    'type': 'button',
 
                    'class': 'btn btn-default btn-xs',
 
                    text: _TM['Retry']
 
                }).click(function() {
 
                    $status.text(_TM['Submitting ...']);
 
                    $preview.addClass('submitting').children('.panel').removeClass('panel-danger');
 
                    ajaxPOST(AJAX_COMMENT_URL, postData, success, failure);
 
                }),
 
                $('<button>', {
 
                    'type': 'button',
 
                    'class': 'btn btn-default btn-xs',
 
                    text: _TM['Cancel']
 
                }).click(function() {
 
                    comment_div_state($comment_div, f_path, line_no);
 
                })
 
            ).appendTo($status);
 
        }
 
        ajaxPOST(AJAX_COMMENT_URL, postData, success, failure);
 
    });
 

			




	
	
	
		
 
    // add event handler for hide/cancel buttons

			




	
	
	
		
 
    $form.find('.hide-inline-form').click(function() {

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/user_groups/user_group_edit_perms.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -58,25 +58,25 @@ ${h.form(url('edit_user_group_perms_upda

			




	
	
	
		
 
                        <td>${h.radio('g_perm_%s' % g2p.user_group.users_group_name,'usergroup.admin')}</td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            <i class="icon-users"></i>

			




	
	
	
		
 
                            %if h.HasPermissionAny('hg.admin')():

			




	
	
	
		
 
                             <a href="${h.url('edit_users_group',id=g2p.user_group.users_group_id)}">

			




	
	
	
		
 
                                 ${g2p.user_group.users_group_name}

			




	
	
	
		
 
                             </a>

			




	
	
	
		
 
                            %else:

			




	
	
	
		
 
                             ${g2p.user_group.users_group_name}

			




	
	
	
		
 
                            %endif

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                        <td>

			




	
	
	
		
 
                            <button class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.user_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.user_group.users_group_name)}', '${g2p.user_group.users_group_name}')">

			




	
	
	
		
 
                            <button type="button" class="btn btn-default btn-xs" onclick="ajaxActionRevoke(${g2p.user_group.users_group_id}, 'user_group', '${'id%s'%id(g2p.user_group.users_group_name)}', '${g2p.user_group.users_group_name}')">

			




	
	
	
		
 
                            <i class="icon-minus-circled"></i>${_('Revoke')}

			




	
	
	
		
 
                            </button>

			




	
	
	
		
 
                        </td>

			




	
	
	
		
 
                    </tr>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                ## New entries added by addPermAction here.

			




	
	
	
		
 
                <tr class="new_members last_new_member" id="add_perm_input"><td colspan="6"></td></tr>

			




	
	
	
		
 
                <tr>

			




	
	
	
		
 
                    <td colspan="6">

			




	
	
	
		
 
                        <button type="button" id="add_perm" class="btn btn-link btn-xs">

			




	
	
	
		
 
                            <i class="icon-plus"></i>${_('Add new')}

			




	
	
	
		
 
                        </button>

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/diff_block.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="diff_block(a_repo_name, a_ref_type, a_ref_name, a_rev,

			




	
	
	
		
 
                       cs_repo_name, cs_ref_name, cs_ref_type, cs_rev,

			




	
	
	
		
 
                       file_diff_data)">

			




	
	
	
		
 
<div class="diff-collapse">

			




	
	
	
		
 
    <button data-target="${'diff-container-%s' % (id(file_diff_data))}" class="diff-collapse-button btn btn-link btn-sm">&uarr; ${_('Collapse Diff')} &uarr;</button>

			




	
	
	
		
 
    <button type='button', data-target="${'diff-container-%s' % (id(file_diff_data))}" class="diff-collapse-button btn btn-link btn-sm">&uarr; ${_('Collapse Diff')} &uarr;</button>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
%for id_fid, url_fid, op, a_filename, cs_filename, diff, stats in file_diff_data:

			




	
	
	
		
 
    ${diff_block_diffblock(id_fid, url_fid, op, diff,

			




	
	
	
		
 
        a_repo_name, a_rev, a_ref_type, a_ref_name, a_filename,

			




	
	
	
		
 
        cs_repo_name, cs_rev, cs_ref_type, cs_ref_name, cs_filename,

			




	
	
	
		
 
        'diff-container-%s' % id(file_diff_data))}

			




	
	
	
		
 
%endfor

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="diff_block_diffblock(id_fid, url_fid, op, diff,

			




	
	
	
		
 
    a_repo_name, a_rev, a_ref_type, a_ref_name, a_filename,

			




	
	
	
		
 
    cs_repo_name, cs_rev, cs_ref_type, cs_ref_name, cs_filename, cls)"

			




        

    


    
    

    

        

                

                    kallithea/templates/data_table/_dt_elements.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -61,78 +61,78 @@

			




	
	
	
		
 
  %if request.authuser.username != 'default':

			




	
	
	
		
 
    <a title="${_('Subscribe to %s atom feed')% name}" href="${webutils.url('atom_feed_home',repo_name=name,api_key=request.authuser.api_key)}"><i class="icon-rss-squared"></i></a>

			




	
	
	
		
 
  %else:

			




	
	
	
		
 
    <a title="${_('Subscribe to %s atom feed')% name}" href="${webutils.url('atom_feed_home',repo_name=name)}"><i class="icon-rss-squared"></i></a>

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_actions(repo_name)">

			




	
	
	
		
 
      <a href="${webutils.url('edit_repo',repo_name=repo_name)}" title="${_('Edit')}" class="btn btn-default btn-xs">

			




	
	
	
		
 
        <i class="icon-pencil"></i>${_('Edit')}

			




	
	
	
		
 
      </a>

			




	
	
	
		
 
      ${webutils.form(webutils.url('delete_repo', repo_name=repo_name))}

			




	
	
	
		
 
        <button name="${'remove_%s' % repo_name}" class="btn btn-default btn-xs"

			




	
	
	
		
 
        <button type="submit" name="${'remove_%s' % repo_name}" class="btn btn-default btn-xs"

			




	
	
	
		
 
            onclick="return confirm('${_('Confirm to delete this repository: %s') % repo_name}');">

			




	
	
	
		
 
          <i class="icon-trashcan"></i>${_('Delete')}

			




	
	
	
		
 
        </button>

			




	
	
	
		
 
      ${webutils.end_form()}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_state(repo_state)">

			




	
	
	
		
 
    %if repo_state == u'repo_state_pending':

			




	
	
	
		
 
        <div class="label label-info">${_('Creating')}</div>

			




	
	
	
		
 
    %elif repo_state == u'repo_state_created':

			




	
	
	
		
 
        <div class="label label-success">${_('Created')}</div>

			




	
	
	
		
 
    %else:

			




	
	
	
		
 
        <div class="label label-danger" title="${repo_state}">invalid</div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="user_actions(user_id, username)">

			




	
	
	
		
 
   <a href="${webutils.url('edit_user',id=user_id)}" title="${_('Edit')}" class="btn btn-default btn-xs">

			




	
	
	
		
 
     <i class="icon-pencil"></i>${_('Edit')}

			




	
	
	
		
 
   </a>

			




	
	
	
		
 
  ${webutils.form(webutils.url('delete_user', id=user_id))}

			




	
	
	
		
 
    <button id="${'remove_user_%s' % user_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}"

			




	
	
	
		
 
    <button type="submit" id="${'remove_user_%s' % user_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}"

			




	
	
	
		
 
        onclick="return confirm('${_('Confirm to delete this user: %s') % username}');">

			




	
	
	
		
 
      <i class="icon-trashcan"></i>${_('Delete')}

			




	
	
	
		
 
    </button>

			




	
	
	
		
 
  ${webutils.end_form()}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="user_group_actions(user_group_id, user_group_name)">

			




	
	
	
		
 
    <a href="${webutils.url('edit_users_group', id=user_group_id)}" title="${_('Edit')}" class="btn btn-default btn-xs">

			




	
	
	
		
 
      <i class="icon-pencil"></i>${_('Edit')}

			




	
	
	
		
 
    </a>

			




	
	
	
		
 
    ${webutils.form(webutils.url('delete_users_group', id=user_group_id))}

			




	
	
	
		
 
      <button id="${'remove_group_%s' % user_group_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}"

			




	
	
	
		
 
      <button type="submit" id="${'remove_group_%s' % user_group_id}" name="${'remove_user_%s' % repo_name}" class="btn btn-default btn-xs" title="${_('Delete')}"

			




	
	
	
		
 
          onclick="return confirm('${_('Confirm to delete this user group: %s') % user_group_name}');">

			




	
	
	
		
 
        <i class="icon-trashcan"></i>${_('Delete')}

			




	
	
	
		
 
      </button>

			




	
	
	
		
 
    ${webutils.end_form()}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="group_name_html(group_name,name)">

			




	
	
	
		
 
  <div class="dt_repo">

			




	
	
	
		
 
    <i class="icon-folder"></i>

			




	
	
	
		
 
    <a href="${webutils.url('repos_group_home',group_name=group_name)}">${name}</a>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_group_actions(repo_group_id, repo_group_name, gr_count)">

			




	
	
	
		
 
    <a href="${webutils.url('edit_repo_group',group_name=repo_group_name)}" title="${_('Edit')}" class="btn btn-default btn-xs">

			




	
	
	
		
 
      <i class="icon-pencil"></i>${_('Edit')}

			




	
	
	
		
 
    </a>

			




	
	
	
		
 
    ${webutils.form(webutils.url('delete_repo_group', group_name=repo_group_name))}

			




	
	
	
		
 
      <button id="${'remove_%s' % repo_group_name}" name="${'remove_%s' % repo_group_name}" class="btn btn-default btn-xs" title="${_('Delete')}"

			




	
	
	
		
 
      <button type="submit" id="${'remove_%s' % repo_group_name}" name="${'remove_%s' % repo_group_name}" class="btn btn-default btn-xs" title="${_('Delete')}"

			




	
	
	
		
 
          onclick="return confirm('${ungettext('Confirm to delete this group: %s with %s repository','Confirm to delete this group: %s with %s repositories',gr_count) % (repo_group_name, gr_count)}')">

			




	
	
	
		
 
        <i class="icon-trashcan"></i>${_('Delete')}

			




	
	
	
		
 
      </button>

			




	
	
	
		
 
    ${webutils.end_form()}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="user_name(user_id, username)">

			




	
	
	
		
 
    ${webutils.link_to(username,webutils.url('edit_user', id=user_id))}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="repo_group_name(repo_group_name, children_groups)">

			




	
	
	
		
 
  <div class="text-nowrap">

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-6865
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support