From 90b82e6145ec4b8e4d425c7d49faa3828afeec1f Mon Sep 17 00:00:00 2001 From: TheCatLady <52870424+TheCatLady@users.noreply.github.com> Date: Tue, 27 Feb 2024 11:34:03 -0800 Subject: [PATCH] [fixinventory][chore] FixInventory -> Fix Inventory --- .github/ISSUE_TEMPLATE/bug.yml | 2 +- Dockerfile.fixinventorybase | 2 +- docker-compose.yaml | 2 +- dockerV2/fixsh-wait | 2 +- fixcore/fixcore/static/api-doc.yaml | 2 +- fixcore/fixcore/templates/create_first_user.html | 10 +++++----- fixcore/fixcore/templates/login.html | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index 1bc1d2d721..f9ca5d38d9 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -17,7 +17,7 @@ body: id: version attributes: label: Version - description: What version of FixInventory are you running? + description: What version of Fix Inventory are you running? validations: required: true - type: input diff --git a/Dockerfile.fixinventorybase b/Dockerfile.fixinventorybase index d4a87cfb60..d443808264 100644 --- a/Dockerfile.fixinventorybase +++ b/Dockerfile.fixinventorybase @@ -16,7 +16,7 @@ RUN echo "I am running on ${BUILDPLATFORM}, building for ${TARGETPLATFORM}" # Prepare whl build env RUN mkdir -p /build /build-python -# Build FixInventory +# Build Fix Inventory COPY requirements-extra.txt /usr/src/requirements-extra.txt COPY fixlib /usr/src/fixlib COPY fixcore /usr/src/fixcore diff --git a/docker-compose.yaml b/docker-compose.yaml index 52912d968d..8caeccadec 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -54,7 +54,7 @@ services: - FIX_LOG_TEXT - FIXCORE_ANALYTICS_OPT_OUT - FIXCORE_GRAPHDB_SERVER=http://graphdb:8529 - # FixInventory will create a new database and user with this password using the root account + # Fix Inventory will create a new database and user with this password using the root account - FIXCORE_GRAPHDB_PASSWORD=changeme command: - --override diff --git a/dockerV2/fixsh-wait b/dockerV2/fixsh-wait index 74783cd85a..aba22db899 100755 --- a/dockerV2/fixsh-wait +++ b/dockerV2/fixsh-wait @@ -13,7 +13,7 @@ main() { trap shutdown SIGINT SIGTERM trap 'error_handler $? $LINENO $BASH_LINENO "$BASH_COMMAND" $(printf "::%s" ${FUNCNAME[@]}); trap - ERR' ERR while [ $run = true ]; do - info "Connect to this container and execute 'fixsh' to start the FixInventory shell" + info "Connect to this container and execute 'fixsh' to start the Fix Inventory shell" sleep 900 || true done else diff --git a/fixcore/fixcore/static/api-doc.yaml b/fixcore/fixcore/static/api-doc.yaml index 26b9ab04b4..9f84d81e1c 100644 --- a/fixcore/fixcore/static/api-doc.yaml +++ b/fixcore/fixcore/static/api-doc.yaml @@ -3,7 +3,7 @@ servers: - url: ../ description: current system info: - title: FixInventory Core REST API + title: Fix Inventory Core REST API version: V1 tags: - name: graph_search diff --git a/fixcore/fixcore/templates/create_first_user.html b/fixcore/fixcore/templates/create_first_user.html index 482c2bb6c8..bab1565328 100644 --- a/fixcore/fixcore/templates/create_first_user.html +++ b/fixcore/fixcore/templates/create_first_user.html @@ -7,7 +7,7 @@
- FixInventory + Fix Inventory

Create Account

{% if error %} @@ -21,14 +21,14 @@

Create Account

- Company Name this instance is registered. Visible in the UI for all users. + Company to which this instance is registered. Visible to users in the UI.
- Name associated with this user. Will be shown in the UI. + Name associated with this user. Visible in the UI.
@@ -46,10 +46,10 @@

Create Account

- Your password to access your FixInventory installation. + Password to access your Fix Inventory installation.
- By submitting this form you accept Terms and Conditions. + By submitting this form, you accept the Fix Inventory terms and conditions.
diff --git a/fixcore/fixcore/templates/login.html b/fixcore/fixcore/templates/login.html index bd49d74571..5f0a6fd022 100644 --- a/fixcore/fixcore/templates/login.html +++ b/fixcore/fixcore/templates/login.html @@ -1,15 +1,15 @@ {% extends "base.html" %} {% block title %} -Login to FixInventory +Log in to Fix Inventory {% endblock %} {% block content %}
- FixInventory + Fix Inventory -

Sign In

+

Log In

{% if error %}
{{ error }} @@ -25,7 +25,7 @@

Sign In

- +