From 4625ea61893dd859d21ae537038684e0f979c239 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Tue, 14 Nov 2023 17:09:46 +0000
Subject: [PATCH] ✏️ : correct GitLab naming

---
 src/main/resources/templates/assignments/accepted.html | 2 +-
 src/main/resources/templates/assignments/new.html | 6 +++---
 src/main/resources/templates/classrooms/list.html | 2 +-
 src/main/resources/templates/classrooms/new.html | 12 ++++++------
 src/main/resources/templates/classrooms/student.html | 2 +-
 src/main/resources/templates/classrooms/view.html | 2 +-
 src/main/resources/templates/dashboard/student-dashboard.html | 2 +-
 src/main/resources/templates/exercise/all-submissions.html | 2 +-
 src/main/resources/templates/layout-without-menu.html | 2 +-
 src/main/resources/templates/layout.html | 2 +-
 src/main/resources/templates/login.html | 4 ++--
 11 file(s) changed, 19 insertion(s)(+), 19 deletion(s)(-)

diff --git a/src/main/resources/templates/assignments/accepted.html b/src/main/resources/templates/assignments/accepted.html
--- a/src/main/resources/templates/assignments/accepted.html
+++ b/src/main/resources/templates/assignments/accepted.html
@@ -31,7 +31,7 @@ </svg>
                 <svg fill="currentColor" stroke="currentColor" viewBox="0 0 256 256" id="Flat" xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 mr-1.5">
                     <path d="M234.415,153.53322,207.08594,51.04787a7.99994,7.99994,0,0,0-15.22022-.74756L170.228,108H85.772L64.13477,50.3008a8.00014,8.00014,0,0,0-15.22071.74707L21.585,153.53322a12.02834,12.02834,0,0,0,4.76416,12.958l94.82031,65.645a11.94608,11.94608,0,0,0,5.45264,2.03467,3.97163,3.97163,0,0,0,.71924.07275c.02734,0,.05517-.00683.08252-.00732.19214.00879.384.02148.57617.02148s.384-.01269.57617-.02148c.02735.00049.05518.00732.08252.00732a3.95865,3.95865,0,0,0,.71826-.07275,11.9487,11.9487,0,0,0,5.45362-2.03467l94.82031-65.645A12.02834,12.02834,0,0,0,234.415,153.53322ZM199.35645,53.1094,213.9939,108H178.772ZM128,220.60891,88.77173,116h78.45654ZM56.644,53.1094,77.228,108H42.00635ZM29.31445,155.59426,39.87305,116H80.228l39.53784,105.43457-88.863-61.52051A4.01148,4.01148,0,0,1,29.31445,155.59426Zm195.78272,4.31982-88.863,61.52051L175.772,116H216.1272l10.55835,39.59424A4.01148,4.01148,0,0,1,225.09717,159.91408Z"></path>
                 </svg>
-                Open Gitlab project
+                Open GitLab project
             </a>
         </div>
     </div>
diff --git a/src/main/resources/templates/assignments/new.html b/src/main/resources/templates/assignments/new.html
--- a/src/main/resources/templates/assignments/new.html
+++ b/src/main/resources/templates/assignments/new.html
@@ -26,7 +26,7 @@ <input x-model="assignmentName" required minlength="3" type="text" name="assignmentName" id="assignmentName"
                                    class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-red-300 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6 invalid:ring-red-300 invalid:text-red-900 invalid:focus:ring-red-500"
                                    placeholder="Name of the assignment (eg : Exercise 101)">
                         </div>
-                        <p x-show="selected === 'EXERCISE'" class="mt-3 text-sm leading-6 text-gray-600">Classroom will create a Gitlab Group with the name of this assignment in <span th:text="${classroom.gitlabUrl}"></span>.</p>
+                        <p x-show="selected === 'EXERCISE'" class="mt-3 text-sm leading-6 text-gray-600">Classroom will create a GitLab Group with the name of this assignment in <span th:text="${classroom.gitlabUrl}"></span>.</p>
                     </div>
 
                     <div class="col-span-full">
@@ -67,7 +67,7 @@ </select>
                     </div>
 
                     <div class="col-span-full" x-show="selected === 'EXERCISE'">
-                        <label for="repositoryId" class="block text-sm font-medium leading-6 text-gray-900">Gitlab Repository Template</label>
+                        <label for="repositoryId" class="block text-sm font-medium leading-6 text-gray-900">GitLab Repository Template</label>
                         <div class="relative mt-2" x-data="{open: false, repository: ''}">
                             <select id="repositoryId" name="repositoryId" class="w-full rounded-md border-0 bg-white py-1.5 pl-3 pr-12 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6" role="combobox" aria-controls="options" aria-expanded="false">
                                 <option></option>
@@ -75,7 +75,7 @@ <option th:each="repository : ${repositories}" th:value="${repository.id}" th:text="${repository.nameWithNamespace}">Repository Name</option>
                             </select>
                         </div>
 
-                        <p class="mt-3 text-sm leading-6 text-gray-600">This repository will be <b>forked</b> in the Classroom Gitlab Group <span th:text="${classroom.gitlabUrl}"></span> the student accepts this assignment.</p>
+                        <p class="mt-3 text-sm leading-6 text-gray-600">This repository will be <b>forked</b> in the GitLab Group <span th:text="${classroom.gitlabUrl}"></span> when the student accepts this assignment.</p>
 
                         <p class="mt-3 text-sm leading-6 text-gray-600">If no repository is selected, Classroom will create an empty repository when the student accepts this assignment.</p>
                     </div>
diff --git a/src/main/resources/templates/classrooms/list.html b/src/main/resources/templates/classrooms/list.html
--- a/src/main/resources/templates/classrooms/list.html
+++ b/src/main/resources/templates/classrooms/list.html
@@ -39,7 +39,7 @@ <a th:href="${classroom.gitlabUrl}" target="_blank" class="inline-flex items-center">
                     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="-ml-0.5 mr-1.5 h-5 w-5">
                         <path stroke-linecap="round" stroke-linejoin="round" d="M13.5 6H5.25A2.25 2.25 0 003 8.25v10.5A2.25 2.25 0 005.25 21h10.5A2.25 2.25 0 0018 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25" />
                     </svg>
-                    Open in Gitlab
+                    Open in GitLab
                 </a>
             </dl>
         </li>
diff --git a/src/main/resources/templates/classrooms/new.html b/src/main/resources/templates/classrooms/new.html
--- a/src/main/resources/templates/classrooms/new.html
+++ b/src/main/resources/templates/classrooms/new.html
@@ -21,20 +21,20 @@ <label for="classroomName" class="block text-sm font-medium leading-6 text-gray-900">Classroom name</label>
                         <div class="mt-2">
                             <input type="text" name="classroomName" id="classroomName" class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6" placeholder="">
                         </div>
-                        <p class="mt-3 text-sm leading-6 text-gray-600">The Classroom name will be used as a Gitlab Group name.</p>
+                        <p class="mt-3 text-sm leading-6 text-gray-600">The Classroom name will be used as a GitLab Group name.</p>
                     </div>
 
                     <div class="col-span-full">
-                        <label for="parentGitlabGroupId" class="block text-sm font-medium leading-6 text-gray-900">Parent Gitlab Group</label>
+                        <label for="parentGitLabGroupId" class="block text-sm font-medium leading-6 text-gray-900">Parent GitLab Group</label>
                         <div class="relative mt-2">
-                            <select id="parentGitlabGroupId" name="parentGitlabGroupId" class="w-full rounded-md border-0 bg-white py-1.5 pl-3 pr-12 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6" role="combobox" aria-controls="options" aria-expanded="false">
+                            <select id="parentGitLabGroupId" name="parentGitLabGroupId" class="w-full rounded-md border-0 bg-white py-1.5 pl-3 pr-12 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6" role="combobox" aria-controls="options" aria-expanded="false">
                                 <option></option>
-                                <option th:each="group : ${groups}" th:value="${group.id}" th:text="${group.name}">Gitlab Group Name</option>
+                                <option th:each="group : ${groups}" th:value="${group.id}" th:text="${group.name}">GitLab Group Name</option>
                             </select>
                         </div>
 
-                        <p class="mt-3 text-sm leading-6 text-gray-600">A new Gitlab Group with the Classroom name will be <b>created</b> in the selected Gitlab Group.</p>
-                        <p class="mt-3 text-sm leading-6 text-gray-600">If no Gitlab Group is selected, the Classroom will be created at the root of Gitlab.</p>
+                        <p class="mt-3 text-sm leading-6 text-gray-600">A new GitLab Group with the Classroom name will be <b>created</b> in the selected GitLab Group.</p>
+                        <p class="mt-3 text-sm leading-6 text-gray-600">If no GitLab Group is selected, the Classroom will be created at the root of GitLab.</p>
                     </div>
                 </div>
             </div>
diff --git a/src/main/resources/templates/classrooms/student.html b/src/main/resources/templates/classrooms/student.html
--- a/src/main/resources/templates/classrooms/student.html
+++ b/src/main/resources/templates/classrooms/student.html
@@ -86,7 +86,7 @@ <svg fill="currentColor" stroke="currentColor" viewBox="0 0 256 256" id="Flat"
                                  xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 mr-1.5">
                                 <path d="M234.415,153.53322,207.08594,51.04787a7.99994,7.99994,0,0,0-15.22022-.74756L170.228,108H85.772L64.13477,50.3008a8.00014,8.00014,0,0,0-15.22071.74707L21.585,153.53322a12.02834,12.02834,0,0,0,4.76416,12.958l94.82031,65.645a11.94608,11.94608,0,0,0,5.45264,2.03467,3.97163,3.97163,0,0,0,.71924.07275c.02734,0,.05517-.00683.08252-.00732.19214.00879.384.02148.57617.02148s.384-.01269.57617-.02148c.02735.00049.05518.00732.08252.00732a3.95865,3.95865,0,0,0,.71826-.07275,11.9487,11.9487,0,0,0,5.45362-2.03467l94.82031-65.645A12.02834,12.02834,0,0,0,234.415,153.53322ZM199.35645,53.1094,213.9939,108H178.772ZM128,220.60891,88.77173,116h78.45654ZM56.644,53.1094,77.228,108H42.00635ZM29.31445,155.59426,39.87305,116H80.228l39.53784,105.43457-88.863-61.52051A4.01148,4.01148,0,0,1,29.31445,155.59426Zm195.78272,4.31982-88.863,61.52051L175.772,116H216.1272l10.55835,39.59424A4.01148,4.01148,0,0,1,225.09717,159.91408Z"></path>
                             </svg>
-                            Open in Gitlab
+                            Open in GitLab
                         </a>
                     </dt>
                 </div>
diff --git a/src/main/resources/templates/classrooms/view.html b/src/main/resources/templates/classrooms/view.html
--- a/src/main/resources/templates/classrooms/view.html
+++ b/src/main/resources/templates/classrooms/view.html
@@ -44,7 +44,7 @@ target="_blank"
                  class="inline-flex items-center rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50">
                     <img src="/images/arrow-top-right-on-square-icon-black.svg" class="h-6 w-6 mr-1.5" alt="external link icon"/>
                     <img src="/images/gitlab-icon.svg" class="h-6 w-6 mr-1.5" alt="gitlab icon"/>
-                    Open in Gitlab
+                    Open in GitLab
                 </a>
             </span>
 
diff --git a/src/main/resources/templates/dashboard/student-dashboard.html b/src/main/resources/templates/dashboard/student-dashboard.html
--- a/src/main/resources/templates/dashboard/student-dashboard.html
+++ b/src/main/resources/templates/dashboard/student-dashboard.html
@@ -74,7 +74,7 @@ </svg>
                                 <svg fill="currentColor" stroke="currentColor" viewBox="0 0 256 256" id="Flat" xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 mr-1.5">
                                     <path d="M234.415,153.53322,207.08594,51.04787a7.99994,7.99994,0,0,0-15.22022-.74756L170.228,108H85.772L64.13477,50.3008a8.00014,8.00014,0,0,0-15.22071.74707L21.585,153.53322a12.02834,12.02834,0,0,0,4.76416,12.958l94.82031,65.645a11.94608,11.94608,0,0,0,5.45264,2.03467,3.97163,3.97163,0,0,0,.71924.07275c.02734,0,.05517-.00683.08252-.00732.19214.00879.384.02148.57617.02148s.384-.01269.57617-.02148c.02735.00049.05518.00732.08252.00732a3.95865,3.95865,0,0,0,.71826-.07275,11.9487,11.9487,0,0,0,5.45362-2.03467l94.82031-65.645A12.02834,12.02834,0,0,0,234.415,153.53322ZM199.35645,53.1094,213.9939,108H178.772ZM128,220.60891,88.77173,116h78.45654ZM56.644,53.1094,77.228,108H42.00635ZM29.31445,155.59426,39.87305,116H80.228l39.53784,105.43457-88.863-61.52051A4.01148,4.01148,0,0,1,29.31445,155.59426Zm195.78272,4.31982-88.863,61.52051L175.772,116H216.1272l10.55835,39.59424A4.01148,4.01148,0,0,1,225.09717,159.91408Z"></path>
                                 </svg>
-                                Open in Gitlab
+                                Open in GitLab
                             </a>
                         </dt>
                     </div>
diff --git a/src/main/resources/templates/exercise/all-submissions.html b/src/main/resources/templates/exercise/all-submissions.html
--- a/src/main/resources/templates/exercise/all-submissions.html
+++ b/src/main/resources/templates/exercise/all-submissions.html
@@ -83,7 +83,7 @@ </svg>
                                     <svg fill="currentColor" stroke="currentColor" viewBox="0 0 256 256" id="Flat" xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 mr-1.5">
                                         <path d="M234.415,153.53322,207.08594,51.04787a7.99994,7.99994,0,0,0-15.22022-.74756L170.228,108H85.772L64.13477,50.3008a8.00014,8.00014,0,0,0-15.22071.74707L21.585,153.53322a12.02834,12.02834,0,0,0,4.76416,12.958l94.82031,65.645a11.94608,11.94608,0,0,0,5.45264,2.03467,3.97163,3.97163,0,0,0,.71924.07275c.02734,0,.05517-.00683.08252-.00732.19214.00879.384.02148.57617.02148s.384-.01269.57617-.02148c.02735.00049.05518.00732.08252.00732a3.95865,3.95865,0,0,0,.71826-.07275,11.9487,11.9487,0,0,0,5.45362-2.03467l94.82031-65.645A12.02834,12.02834,0,0,0,234.415,153.53322ZM199.35645,53.1094,213.9939,108H178.772ZM128,220.60891,88.77173,116h78.45654ZM56.644,53.1094,77.228,108H42.00635ZM29.31445,155.59426,39.87305,116H80.228l39.53784,105.43457-88.863-61.52051A4.01148,4.01148,0,0,1,29.31445,155.59426Zm195.78272,4.31982-88.863,61.52051L175.772,116H216.1272l10.55835,39.59424A4.01148,4.01148,0,0,1,225.09717,159.91408Z"></path>
                                     </svg>
-                                    Open in Gitlab
+                                    Open in GitLab
                                 </a>
                             </td>
                             <td class="whitespace-nowrap px-3 py-5 text-sm text-gray-500">
diff --git a/src/main/resources/templates/layout-without-menu.html b/src/main/resources/templates/layout-without-menu.html
--- a/src/main/resources/templates/layout-without-menu.html
+++ b/src/main/resources/templates/layout-without-menu.html
@@ -10,7 +10,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="icon" href="/images/favicon.png">
     <script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio"></script>
     <script src="//unpkg.com/alpinejs" defer></script>
-    <title>Gitlab Classroom</title>
+    <title>GitLab Classroom</title>
 </head>
 <body class="h-full">
 
diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html
--- a/src/main/resources/templates/layout.html
+++ b/src/main/resources/templates/layout.html
@@ -10,7 +10,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="icon" href="/images/favicon.png">
     <script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio"></script>
     <script src="//unpkg.com/alpinejs" defer></script>
-    <title>Gitlab Classroom</title>
+    <title>GitLab Classroom</title>
 </head>
 <body class="h-full">
 
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -5,7 +5,7 @@ <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="icon" href="/images/favicon.png">
     <script src="https://cdn.tailwindcss.com?plugins=forms,typography,aspect-ratio"></script>
-    <title>Gitlab Classroom - Login</title>
+    <title>GitLab Classroom - Login</title>
 </head>
 <body class="h-full">
 <!--
@@ -42,7 +42,7 @@ <div class="mt-10">
                 <a th:href="@{/oauth2/authorization/gitlab}"
                    class="flex w-full items-center justify-center gap-3 rounded-md bg-white px-3 py-1.5 text-black border border-[#fc6d26] rounded focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[#1D9BF0]">
                     <img width="35" src="/images/gitlab-logo-500.svg" />
-                    <span class="text-sm font-semibold leading-6">Login with Gitlab</span>
+                    <span class="text-sm font-semibold leading-6">Login with GitLab</span>
                 </a>
             </div>
         </div>

--
tangled.sh