Changeset - 25da0eeaa3ea
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 9 years ago 2016-12-04 22:53:37
mads@kiilerich.com
style: tweak markup for API key admin

The labels were odd - this gives a better starting point for a good Bootstrap UI.

TODO after Bootstrap: Don't use a label as header for the "Add" section.
2 files changed with 20 insertions and 5 deletions:
kallithea/templates/admin/my_account/my_account_api_keys.html
10
2
kallithea/templates/admin/users/user_edit_api_keys.html
10
3
0 comments (0 inline, 0 general)
kallithea/templates/admin/my_account/my_account_api_keys.html
➞
Show inline comments
 
<div class="apikeys_wrap">
 
  <table class="noborder">
 
    <tr>
 
        <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${c.user.api_key}</div></td>
 
        <td>
 
            <span class="label label-success">${_('Built-in')}</span>
 
        </td>
 
        <td>${_('Expires')}: ${_('Never')}</td>
 
        <td>
 
            ${h.form(url('my_account_api_keys_delete'))}
 
                ${h.hidden('del_api_key',c.user.api_key)}
 
                ${h.hidden('del_api_key_builtin',1)}
 
                <button class="btn btn-danger btn-xs" type="submit"
 
                        onclick="return confirm('${_('Confirm to reset this API key: %s') % c.user.api_key}');">
 
                    ${_('Reset')}
 
                </button>
 
            ${h.end_form()}
 
        </td>
 
    </tr>
 
    %if c.user_api_keys:
 
        %for api_key in c.user_api_keys:
 
          <tr class="${'expired' if api_key.expired else ''}">
 
            <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${api_key.api_key}</div></td>
 
            <td>${api_key.description}</td>
 
            <td style="min-width: 80px">
 
                 %if api_key.expires == -1:
 
                  ${_('Expires')}: ${_('Never')}
 
                 %else:
 
                    %if api_key.expired:
 
                        ${_('Expired')}: ${h.age(h.time_to_datetime(api_key.expires))}
 
                    %else:
 
                        ${_('Expires')}: ${h.age(h.time_to_datetime(api_key.expires))}
 
                    %endif
 
                 %endif
 
            </td>
 
            <td>
 
                ${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 class="control-label" for="description">${_('New API key')}:</label>

			




	
	
	
		
 
                <div class="form-inline">

			




	
	
	
		
 
                <label class="control-label">${_('New API key')}</label>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="description">${_('Description')}:</label>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.text('description', class_='form-control', placeholder=_('Description'))}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="lifetime">${_('Lifetime')}:</label>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${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_api_keys.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<div class="apikeys_wrap">

			




	
	
	
		
 
  <table class="noborder">

			




	
	
	
		
 
    <tr>

			




	
	
	
		
 
        <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${c.user.api_key}</div></td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            <span class="label label-success">${_('Built-in')}</span>

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
        <td>${_('Expires')}: ${_('Never')}</td>

			




	
	
	
		
 
        <td>

			




	
	
	
		
 
            ${h.form(url('edit_user_api_keys_delete', id=c.user.user_id))}

			




	
	
	
		
 
                ${h.hidden('del_api_key',c.user.api_key)}

			




	
	
	
		
 
                ${h.hidden('del_api_key_builtin',1)}

			




	
	
	
		
 
                <button class="btn btn-danger btn-xs" type="submit"

			




	
	
	
		
 
                        onclick="return confirm('${_('Confirm to reset this API key: %s') % c.user.api_key}');">

			




	
	
	
		
 
                    ${_('Reset')}

			




	
	
	
		
 
                </button>

			




	
	
	
		
 
            ${h.end_form()}

			




	
	
	
		
 
        </td>

			




	
	
	
		
 
    </tr>

			




	
	
	
		
 
    %if c.user_api_keys:

			




	
	
	
		
 
        %for api_key in c.user_api_keys:

			




	
	
	
		
 
          <tr class="${'expired' if api_key.expired else ''}">

			




	
	
	
		
 
            <td style="width: 450px"><div class="truncate autoexpand" style="width:120px;font-size:16px;font-family: monospace">${api_key.api_key}</div></td>

			




	
	
	
		
 
            <td>${api_key.description}</td>

			




	
	
	
		
 
            <td style="min-width: 80px">

			




	
	
	
		
 
                 %if api_key.expires == -1:

			




	
	
	
		
 
                  ${_('Expires')}: ${_('Never')}

			




	
	
	
		
 
                 %else:

			




	
	
	
		
 
                    %if api_key.expired:

			




	
	
	
		
 
                        ${_('Expired')}: ${h.age(h.time_to_datetime(api_key.expires))}

			




	
	
	
		
 
                    %else:

			




	
	
	
		
 
                        ${_('Expires')}: ${h.age(h.time_to_datetime(api_key.expires))}

			




	
	
	
		
 
                    %endif

			




	
	
	
		
 
                 %endif

			




	
	
	
		
 
            </td>

			




	
	
	
		
 
            <td>

			




	
	
	
		
 
                ${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="form-inline">

			




	
	
	
		
 
                <label class="control-label">${_('New API key')}</label>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="description">${_('Description')}:</label>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${h.text('description', class_='form-control', placeholder=_('Description'))}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="form-group">

			




	
	
	
		
 
                <label class="control-label" for="lifetime">${_('Lifetime')}:</label>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
                    ${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>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.