ssh: add few explanation text about two step addition of generated keys.

Based on feedback from customers.

rhodecode/templates/admin/my_account/my_account_ssh_keys.mako

@@ -1,84 +1,87 b''
 <div class="panel panel-default">
     <div class="panel-heading">
       <h3 class="panel-title">${_('SSH Keys')}</h3>
     </div>
     <div class="panel-body">
         <div class="sshkeys_wrap">
           <table class="rctable ssh_keys">
             <tr>
                 <th>${_('Fingerprint')}</th>
                 <th>${_('Description')}</th>
                 <th>${_('Created')}</th>
                 <th>${_('Action')}</th>
             </tr>
             % if not c.ssh_enabled:
                 <tr><td colspan="4"><div class="">${_('SSH Keys usage is currently disabled, please ask your administrator to enable them.')}</div></td></tr>
             % else:
                 %if c.user_ssh_keys:
                     %for ssh_key in c.user_ssh_keys:
                       <tr class="">
                         <td class="">
                             <code>${ssh_key.ssh_key_fingerprint}</code>
                         </td>
                         <td class="td-wrap">${ssh_key.description}</td>
                         <td class="td-tags">${h.format_date(ssh_key.created_on)}</td>
 
                         <td class="td-action">
                             ${h.secure_form(h.route_path('my_account_ssh_keys_delete'), request=request)}
                                 ${h.hidden('del_ssh_key', ssh_key.ssh_key_id)}
                                 <button class="btn btn-link btn-danger" type="submit"
                                         onclick="return confirm('${_('Confirm to remove ssh key %s') % ssh_key.ssh_key_fingerprint}');">
                                     ${_('Delete')}
                                 </button>
                             ${h.end_form()}
                         </td>
                       </tr>
                     %endfor
                 %else:
                 <tr><td colspan="4"><div class="">${_('No additional ssh keys specified')}</div></td></tr>
                 %endif
             % endif
           </table>
         </div>
 
         % if c.ssh_enabled:
         <div class="user_ssh_keys">
             ${h.secure_form(h.route_path('my_account_ssh_keys_add'), request=request)}
             <div class="form form-vertical">
                 <!-- fields -->
                 <div class="fields">
                     <div class="field">
                         <div class="label">
                             <label for="new_email">${_('New ssh key')}:</label>
                         </div>
                         <div class="input">
                             ${h.text('description', class_='medium', placeholder=_('Description'))}
                             <a href="${h.route_path('my_account_ssh_keys_generate')}">${_('Generate random RSA key')}</a>
                         </div>
                      </div>
 
                     <div class="field">
                         <div class="textarea text-area editor">
                             ${h.textarea('key_data',c.default_key, size=30, placeholder=_("Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'"))}
                         </div>
                     </div>
 
                     <div class="buttons">
                       ${h.submit('save',_('Add'),class_="btn")}
                       ${h.reset('reset',_('Reset'),class_="btn")}
                     </div>
+                    % if c.default_key:
+                        ${_('Click add to use this generate SSH key')}
+                    % endif
                 </div>
             </div>
             ${h.end_form()}
         </div>
         % endif
     </div>
 </div>
 
 <script>
 
 $(document).ready(function(){
 
 
 });
 </script>

rhodecode/templates/admin/users/user_edit_ssh_keys.mako

@@ -1,78 +1,81 b''
 <div class="panel panel-default">
     <div class="panel-heading">
       <h3 class="panel-title">${_('SSH Keys')}</h3>
     </div>
     <div class="panel-body">
         <div class="sshkeys_wrap">
           <table class="rctable ssh_keys">
             <tr>
                 <th>${_('Fingerprint')}</th>
                 <th>${_('Description')}</th>
                 <th>${_('Created')}</th>
                 <th>${_('Action')}</th>
             </tr>
             %if c.user_ssh_keys:
                 %for ssh_key in c.user_ssh_keys:
                   <tr class="">
                     <td class="">
                         <code>${ssh_key.ssh_key_fingerprint}</code>
                     </td>
                     <td class="td-wrap">${ssh_key.description}</td>
                     <td class="td-tags">${h.format_date(ssh_key.created_on)}</td>
 
                     <td class="td-action">
                         ${h.secure_form(h.route_path('edit_user_ssh_keys_delete', user_id=c.user.user_id), request=request)}
                             ${h.hidden('del_ssh_key', ssh_key.ssh_key_id)}
                             <button class="btn btn-link btn-danger" type="submit"
                                     onclick="return confirm('${_('Confirm to remove ssh key %s') % ssh_key.ssh_key_fingerprint}');">
                                 ${_('Delete')}
                             </button>
                         ${h.end_form()}
                     </td>
                   </tr>
                 %endfor
             %else:
             <tr><td><div class="ip">${_('No additional ssh keys specified')}</div></td></tr>
             %endif
           </table>
         </div>
 
         <div class="user_ssh_keys">
             ${h.secure_form(h.route_path('edit_user_ssh_keys_add', user_id=c.user.user_id), request=request)}
             <div class="form form-vertical">
                 <!-- fields -->
                 <div class="fields">
                     <div class="field">
                         <div class="label">
                             <label for="new_email">${_('New ssh key')}:</label>
                         </div>
                         <div class="input">
                             ${h.text('description', class_='medium', placeholder=_('Description'))}
                             <a href="${h.route_path('edit_user_ssh_keys_generate_keypair', user_id=c.user.user_id)}">${_('Generate random RSA key')}</a>
                         </div>
                      </div>
 
                     <div class="field">
                         <div class="textarea text-area editor">
                             ${h.textarea('key_data',c.default_key, size=30, placeholder=_("Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'"))}
                         </div>
                     </div>
 
                     <div class="buttons">
                       ${h.submit('save',_('Add'),class_="btn")}
                       ${h.reset('reset',_('Reset'),class_="btn")}
                     </div>
+                    % if c.default_key:
+                        ${_('Click add to use this generate SSH key')}
+                    % endif
                 </div>
             </div>
             ${h.end_form()}
         </div>
     </div>
 </div>
 
 <script>
 
 $(document).ready(function(){
 
 
 });
 </script>

rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako

@@ -1,48 +1,49 b''
 <div class="panel panel-default">
     <div class="panel-heading">
       <h3 class="panel-title">${_('New SSH Key generated')}</h3>
     </div>
     <div class="panel-body">
         <p>
             ${_('Below is a 2048 bit generated SSH RSA key. You can use it to access RhodeCode via the SSH wrapper.')}
         </p>
         <h4>${_('Private key')}</h4>
         <pre>
 # Save the content as
 ~/.ssh/id_rsa_rhodecode_access_priv.key
 # Change permissions
 chmod 0600 ~/.ssh/id_rsa_rhodecode_access_priv.key
         </pre>
 
         <div>
             <textarea style="height: 300px">${c.private}</textarea>
         </div>
         <br/>
 
 
         <h4>${_('Public key')}</h4>
         <pre>
 # Save the content as
 ~/.ssh/id_rsa_rhodecode_access_pub.key
 # Change permissions
 chmod 0600 ~/.ssh/id_rsa_rhodecode_access_pub.key
         </pre>
 
         <input type="text" value="${c.public}" class="large text" size="100"/>
         <p>
             % if hasattr(c, 'target_form_url'):
-                <a href="${c.target_form_url}">${_('Add this generated key')}</a>
+                <a href="${c.target_form_url}">${_('Use this generated key')}.</a>
             % else:
-                <a href="${h.route_path('edit_user_ssh_keys', user_id=c.user.user_id, _query=dict(default_key=c.public))}">${_('Add this generated key')}</a>
+                <a href="${h.route_path('edit_user_ssh_keys', user_id=c.user.user_id, _query=dict(default_key=c.public))}">${_('Use this generated key')}.</a>
             % endif
+            ${_('Confirmation required on the next screen')}.
         </p>
     </div>
 </div>
 
 <script>
 
 $(document).ready(function(){
 
 
 });
 </script>