diff --git a/controlpanel/frontend/jinja2/app-secret-create.html b/controlpanel/frontend/jinja2/app-secret-create.html index a982afb68..bc35eb638 100644 --- a/controlpanel/frontend/jinja2/app-secret-create.html +++ b/controlpanel/frontend/jinja2/app-secret-create.html @@ -9,7 +9,7 @@ {% block content %}

{{ page_title }} - [{{ form.env_name.value() }}]

-

Adding suffix as part of key is encourage, please avoid to use ECR_ and KUBE_ as suffix as they have been used for other purposes

+

Adding a suffix as part of the key is encouraged. Please avoid using ECR_ and KUBE_ as suffixes as they are used for other purposes

{% if form.error %}
{{ form.error }}
{% endif %} diff --git a/controlpanel/frontend/jinja2/app-secret-update.html b/controlpanel/frontend/jinja2/app-secret-update.html index ca1b47f8e..ef1088c21 100644 --- a/controlpanel/frontend/jinja2/app-secret-update.html +++ b/controlpanel/frontend/jinja2/app-secret-update.html @@ -4,7 +4,7 @@ {% extends "base.html" %} {% block content %} -

Update the secret: {{ form.display_key.value() }} - [{{ form.env_name.value() }}]

+

Update Secret: {{ form.display_key.value() }} - [{{ form.env_name.value() }}]

{% if form.error %}
{{ form.error }}
diff --git a/controlpanel/frontend/jinja2/app-variable-manage.html b/controlpanel/frontend/jinja2/app-variable-manage.html index 40b13b604..f42329a64 100644 --- a/controlpanel/frontend/jinja2/app-variable-manage.html +++ b/controlpanel/frontend/jinja2/app-variable-manage.html @@ -9,12 +9,12 @@ {% block content %} {% if form.key.value() %} -

Update the variable: {{ form.display_key.value() }} - [{{ form.env_name.value() }}]

+

Update Variable: {{ form.display_key.value() }} - [{{ form.env_name.value() }}]

{% else %} -

Add deployment an variable for the app - [{{ form.env_name.value() }}]

+

Add environemnt variable - [{{ form.env_name.value() }}]

+

Adding a suffix as part of the key is encouraged.

{% endif %}
-

Adding suffix as part of key is encourage.

{% if form.errors %} {{ govukErrorMessage({"text": form.errors}) }} diff --git a/controlpanel/frontend/jinja2/base.html b/controlpanel/frontend/jinja2/base.html index 6367bc148..29f45d51a 100644 --- a/controlpanel/frontend/jinja2/base.html +++ b/controlpanel/frontend/jinja2/base.html @@ -9,6 +9,7 @@ {% set home_url = url("index") %} {% set signout_url = url("oidc_logout") %} + {% block page_title %} {{ page_title }} | {{ service_name }} {% endblock %} @@ -83,7 +84,6 @@ "text": "Home", "href": home_url, "active": page_name == "home", - "admin": request.user.is_superuser, }, { "hide": not request.user.is_staff, @@ -116,7 +116,6 @@ "text": "Groups", "href": url("list-policies"), "active": page_name == "groups", - "admin": request.user.is_superuser, }, { "text": "Training", diff --git a/controlpanel/frontend/jinja2/customers-list.html b/controlpanel/frontend/jinja2/customers-list.html index f693c9a2f..8a7914434 100644 --- a/controlpanel/frontend/jinja2/customers-list.html +++ b/controlpanel/frontend/jinja2/customers-list.html @@ -49,7 +49,7 @@

- App customers under {{ groups_dict.get(group_id) }} environment + Customers under {{ groups_dict.get(group_id) }} environment {{ modal_dialog(app_customers_html|safe) }}

@@ -114,7 +114,7 @@

{{ csrf_input }}
{% if errors and errors.customer_email %} {% for error in errors.customer_email %} diff --git a/controlpanel/frontend/jinja2/help.html b/controlpanel/frontend/jinja2/help.html index 27e7ff521..3a3b7b96f 100644 --- a/controlpanel/frontend/jinja2/help.html +++ b/controlpanel/frontend/jinja2/help.html @@ -5,71 +5,59 @@ {% block content %}
- - - - -

Help

- -

Common queries, support tasks and problems are - explained in the following videos.

- -

Should you still require help, please visit our - help and support documentation. - If you encounter a technical issue with our infrastructure, please visit our - support channel on Slack. - Please remember to tell us your GitHub username and the name of any - affected S3 buckets or applications on the Analytical Platform that are - affected by the problem.

- -

What is the Analytical Platform?

- - - -

Related links:

- - -

Home Directory Reset

- -

You need to reset your home directory if any of the - following applies:

- -
    -
  • Your RStudio won't start.
    • -
  • Your Conda environment is a mess.
    • -
  • You need to start RStudio development from a clean state.
    • -
- - - -
    -
  1. From the Analytic tools page, - follow the link to reset your home page.
    2. -
  2. Read the information about what a home reset entails.
    3. -
  3. Enable the confirmation check-box and click the red "Reset" button.
    4. -
  4. You'll be returned to the Analytic tools page, but will see a - confirmation that the reset is underway.
    5. -
  5. Depending on the size of your home directory, this process can - take between seconds to a couple of minutes. Go make a coffee!
    6. -
  6. Finally, on the Analytic tools - page, click the "Restart" button for RStudio.
    7. -
  7. Give RStudio a few minutes to start up.
    8. -
- - - +

Help

+ +

Common questions, support tasks and issues are + addressed in the following videos.

+ +

If you still require help, please visit our + help and support documentation. + If you encounter a technical issue with our infrastructure, please raise a + support ticket on Github. + Please provide your GitHub username and the names of any + S3 buckets or applications on the Analytical Platform that are + impacted.

+ +

What is the Analytical Platform?

+ + + +

Related links:

+ + +

Home Directory Reset

+ +

You need to reset your home directory if:

+ +
    +
  • Your RStudio won't start.
    • +
  • Your Conda environment needs resetting.
    • +
  • You need to start RStudio development from a clean state.
    • +
+ + + +
    +
  1. From the Analytical tools page, + follow the link to reset your home page.
    2. +
  2. Read the information about what a home reset entails.
    3. +
  3. Enable the confirmation check-box and click the red "Reset" button.
    4. +
  4. You will be redirected back to the Analytical tools page, where you will see confirmation that the reset process has started.
    5. +
  5. Once your environment has been reset, click the "Restart" button for RStudio on the Analytical tools page.
    6. +
  6. Give RStudio time to start up.
    7. +
{% endblock %} diff --git a/controlpanel/frontend/jinja2/ip-allowlist-detail.html b/controlpanel/frontend/jinja2/ip-allowlist-detail.html index e8a944caa..21a8afa64 100644 --- a/controlpanel/frontend/jinja2/ip-allowlist-detail.html +++ b/controlpanel/frontend/jinja2/ip-allowlist-detail.html @@ -14,7 +14,7 @@ {% block content %}

{{ page_title }}

-

This ip_range are used by {{ ip_allowlist.apps.count() }} different deployment environments from all the apps

+

These IP ranges are used by {{ ip_allowlist.apps.count() }} different deployment environments across all apps

{% if form.errors %} {{ govukErrorMessage({"text": form.errors}) }} {% endif %} diff --git a/controlpanel/frontend/jinja2/reset.html b/controlpanel/frontend/jinja2/reset.html index 45094882e..3478583ff 100644 --- a/controlpanel/frontend/jinja2/reset.html +++ b/controlpanel/frontend/jinja2/reset.html @@ -22,13 +22,13 @@

{% endif %}

Home Directory Reset

-

Even the best curated home directories can get into a bad +

Even the best curated home directories can get into an unusable state (for example, a broken conda environment or Jupyter and RStudio won't start).

-

Reset your home directory to recreate your conda environment and shell - settings to a clean state. This feature automates the - process described here.

+

This feature automates the + process described here. Make sure to save + any open files before resetting as you could lose any unsaved work.

@@ -48,7 +48,7 @@

Home Directory Reset

{% if form.errors %} - Error: + Error: Confirm you want to reset your home directory {% endif %} @@ -56,7 +56,7 @@

Home Directory Reset

{{ form.confirm }}
diff --git a/controlpanel/frontend/jinja2/tool-list.html b/controlpanel/frontend/jinja2/tool-list.html index 9fa9d3283..21cf95eb2 100644 --- a/controlpanel/frontend/jinja2/tool-list.html +++ b/controlpanel/frontend/jinja2/tool-list.html @@ -9,7 +9,7 @@

Your tools

The status of your tools will update automatically.

-

If your tools get into a broken state, try +

If your tools get into an unusable state, try resetting your home directory.

{% for chart_name, tool_info in tools_info.items() %} @@ -110,9 +110,9 @@

{{ tool_info.name }}

{% if deployment and deployment.tool_id == -1 %}

- Looks like your current deployment ({{ deployment.chart_name}}-{{ deployment.chart_version }}: {{ deployment.image_tag }}) - was not recognised within current maintained tool release versions, No worry you can still open it and have a look, - then feel free to switch one of versions from above dropdown list. + Your current deployment ({{ deployment.chart_name}}-{{ deployment.chart_version }}: {{ deployment.image_tag }}) + is not recognised as a current maintained tool release. You can still use it, + but it is recommended to switch to a new version from the dropdown list.

{% endif %} @@ -145,15 +145,6 @@

Airflow

- -

- {% if env == "alpha" %} - You can view your resource utilisation on Grafana (opens in new tab). - {% else %} - (Grafana not available in {{ env }} environment) - {% endif %} -

-

You can access AWS services such as S3 and Athena via the AWS Console (opens in new tab).

diff --git a/controlpanel/frontend/jinja2/user-detail.html b/controlpanel/frontend/jinja2/user-detail.html index 74291eda9..063a26943 100644 --- a/controlpanel/frontend/jinja2/user-detail.html +++ b/controlpanel/frontend/jinja2/user-detail.html @@ -27,7 +27,7 @@

The user of this account has not logged in for over 90 days.

-

If appropriate, please visit the GitHub page for their membership of the +

If necessary, please visit the GitHub page for their membership of the Ministry of Justice organisation to free up space.

diff --git a/controlpanel/frontend/jinja2/webapp-detail.html b/controlpanel/frontend/jinja2/webapp-detail.html index d3a501d22..038397a53 100644 --- a/controlpanel/frontend/jinja2/webapp-detail.html +++ b/controlpanel/frontend/jinja2/webapp-detail.html @@ -44,8 +44,8 @@

Webapp repo setting

- Couldn't find/read the app's information from github repo based on the repo url, please - check whether the repo_url exists or whether you have enough permission to access this repo + Couldn't find/read the app's information from github based on the repo url, please + check whether the repo url exists or whether you have permission to access this repo

Raw error message: {{ repo_access_error_msg }}

@@ -75,7 +75,7 @@

App resources usage dashboard

Deployment Pipeline

Github workflows on app's repo are used for deploying the app.

-

You are required to be member of admin team for this app repo in order to be able to maintain the deployments settings

+

You must be a member of the admin team for this app repo to be able to maintain the deployment settings

diff --git a/controlpanel/frontend/jinja2/webapp-update-ip-allowlists.html b/controlpanel/frontend/jinja2/webapp-update-ip-allowlists.html index d772af857..62ee8454f 100644 --- a/controlpanel/frontend/jinja2/webapp-update-ip-allowlists.html +++ b/controlpanel/frontend/jinja2/webapp-update-ip-allowlists.html @@ -39,7 +39,7 @@

If you would like to restrict access to your app to IP networks not covered by the allowlists given above, - contact the Analytical Platform team via our support Slack channel. + contact the Analytical Platform team by raising a support ticket on Github.

diff --git a/controlpanel/frontend/static/components/navbar/macro.html b/controlpanel/frontend/static/components/navbar/macro.html index 21cc5f8f6..529605e21 100644 --- a/controlpanel/frontend/static/components/navbar/macro.html +++ b/controlpanel/frontend/static/components/navbar/macro.html @@ -14,7 +14,6 @@
  • {{- item.html | safe if item.html else item.text -}} - {% if item.admin %}🔧{% endif %}
    • {% endif -%} diff --git a/settings.yaml b/settings.yaml index b90278858..6f053cc5b 100644 --- a/settings.yaml +++ b/settings.yaml @@ -84,9 +84,9 @@ AUTH0_NOMIS_GATEWAY_URL: "https://testing.com" BROADCAST_MESSAGE: > - We are on the edge of hitting the limit of AWS S3 bucket (1000). | Before we implement the long term solution, - could you make sure you remove the buckets you do not need any more? also make sure not create more buckets than your need, - try to use sub-folders to manage different datasets rather than multiple buckets. + We are close to hitting the 1000 bucket limit on AWS. | Before we work on a long-term solution, + please delete any unnecessary buckets and avoid creating more than you need. + Consider using sub-folders to manage different datasets instead of multiple buckets. GITHUB_VERSION: "2022-11-28"