Commit a1bf56d4 authored by BAIRE Anthony's avatar BAIRE Anthony

Merge branch 'ui-suggestions' into 'django'

UI : two suggestions for the user

See merge request !153
parents b927a987 04827ac2
Pipeline #56500 failed with stage
in 1 minute and 9 seconds
......@@ -429,9 +429,9 @@ class WebappImport(ProviderAccessMixin, SuccessMessageMixin, FormView):
# ensure this app has the same owner
if email_addr is None:
return error("""this webapp belongs to another user (if you think
it really belongs to you, then you should contact the
administrators)""")
return error("""this webapp belongs to another user (different
e-mail address). If this other e-mail address belongs to you,
then you should add it to your profile.""")
# ensure the user email is verified
if not email_addr.verified:
......
......@@ -159,7 +159,7 @@
{% else %}
<p class="mt-3">In order to run a job you need to by <a href="{% url 'account_login' %}" title="Sign in on A||Go">identified</a>
<p class="mt-3">In order to run a job you need to be <a href="{% url 'account_login' %}" title="Sign in on A||Go">identified</a>
or <a href="{% url 'account_signup' %}" title="Sign up on A||Go">register a new account</a>.</p>
{% endif %}
</div>
......
......@@ -76,7 +76,13 @@
the command below or click to the Docker panel if you prefer to use this method
or are using continuous development.
<h5>1. Connect to SSH</h5>
<h5>1. Connect via SSH</h5>
{% if not user.allgouser.sshkey %}
<p><span class="text-danger"><i class="fas fa-exclamation-circle text-danger"></i> important:</span>
you must <a href="{% url 'main:user_ssh_add' %}">add your public SSH key</a> to your account before using this command
</p>
{% endif %}
<pre class="language-bash mb-3"><code class="language-*">{{ ssh_command }}</code></pre>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment