Merge remote-tracking branch 'upstream/develop' into css-color-consistency

Author: Arnei

.github/assets/index.css

@@ -0,0 +1,96 @@
+@media (prefers-color-scheme: light) {
+    :root {
+        --header-color: linear-gradient(to bottom,#388ed6,#2075b1);
+        --bg-color: #fafafa;
+        --text-color: #0F0F0F;
+        --container-color: #fafafa;
+        --boxShadow-color: #0000004d;
+        --border-color: #1d3041;
+        --navbar-color: #24425c;
+        --item-color: #ebeef1;
+        --item-border: #c9d0d6;
+        --item-hover: linear-gradient(to bottom, #fafafa, #e8ebef);
+        --item-inner-boxShadow-color: #0000000d;
+        --item-boxShadow-color: #96969626;
+    }
+}
+
+body {
+    margin: 0px;
+    background: var(--bg-color, #F8F4F1);
+    font-family: Roboto Flex Variable, Roboto, -apple-system, BlinkMacSystemFont, Segoe UI, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
+}
+
+/* Text Container */
+.text-container {
+    /* Layout */
+    margin: 3% auto;
+    max-width: 75%;
+    padding: 10px 15px 10px 15px;
+
+    /* Styling */
+    border-radius: 5px;
+    background: var(--container-color, #F8F4F1);
+    box-shadow: 0 1px 3px 1px var(--boxShadow-color, #0000004d);
+}
+.text-container > p {
+    color: var(--text-color, #0F0F0F);
+    text-align: center;
+    font-size: 20px;
+    font-weight: 400;
+}
+
+/* Header */
+.head-container { 
+    width: 100%;
+    height: 50px;
+    box-shadow: 0 1px 3px 1px  var(--boxShadow-color, #0000004d);
+    position: relative;
+    border-bottom: 1px solid var(--border-color, #1d3041);
+    background: var(--header-color, linear-gradient(to bottom,#388ed6,#2075b1));
+
+}
+.head-container > img {
+    /*Image Style*/
+    width: 100px;
+    height: 20px;
+    padding: 14px 20px 13px;
+}
+.navbar-container { 
+    width: 100%;
+    min-height: 80px;
+    background: var(--navbar-color, #24425c);
+}
+
+/* Version-List */
+ul {
+    list-style-type: none;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-wrap: wrap;
+    column-gap: 20px;
+    row-gap: 10px;
+}
+
+li {
+    width: 160px;
+    text-align: center;
+    padding: 15px 10px;
+    border-radius: 4px;
+    border: 1px solid var(--item-border, #c9d0d6);
+    background: var(--item-color, #ebeef1);
+    box-shadow: inset 0 3px 10px 2px var(--item-inner-boxShadow-color, #0000000d),  0px 5px 10px 0px var(--item-boxShadow-color, #96969626);
+}
+
+li:hover {
+    background: var(--item-hover, linear-gradient(to bottom, #fafafa, #e8ebef));
+}
+
+li > a {
+    color: var(--text-color, #0F0F0F);
+    font-size: 18px;
+    font-weight: 400;
+    text-decoration: none;
+    padding:15px 50px;
+}

.github/assets/opencast-white.svg

@@ -1,11 +1,11 @@
-name: Check ICLA
+name: Check » ICLA
 on:
   pull_request_target:
     types:
       - opened
 
 jobs:
-  main:
+  check-icla:
     if: github.event.pull_request.user.login != 'dependabot[bot]'
     runs-on: ubuntu-24.04
     steps:

.github/workflows/check-icla.yml

@@ -1,14 +1,14 @@
 # This workflow runs on any change made to a pull-request and aims to verify
 # that the correct label is present.
 
-name: Check proper label usage
+name: Check » Proper label usage
 
 on:
   pull_request_target:
     types: [opened, labeled, unlabeled, synchronize]
 
 jobs:
-  labels:
+  check-labels:
     runs-on: ubuntu-latest
     steps:
       # Ensure that one of the required labels is present and none of the undesired is absent

.github/workflows/check-label.yml

@@ -1,4 +1,4 @@
-name: Merge conflict check
+name: Check » Merge conflicts
 on:
   push:
   pull_request_target:
@@ -7,7 +7,7 @@ on:
       - synchronize
 
 jobs:
-  main:
+  check-merge-conflicts:
     runs-on: ubuntu-latest
     steps:
       - name: Check for dirty pull requests
@@ -18,4 +18,4 @@ jobs:
           commentOnDirty: |
               This pull request has conflicts ☹
               Please resolve those so we can review the pull request.
-              Thanks.
+              Thanks.

.github/workflows/check-merge-conflict.yml

@@ -6,33 +6,33 @@ on:
   workflow_dispatch:
 
 jobs:
-  update-translations:
+  download-translations:
     if: github.repository_owner == 'opencast'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
-      - name: prepare git
+      - name: Prepare git
         run: |
           git config --global user.email 'crowdin-bot@opencast.org'
           git config --global user.name 'Crowdin Bot'
 
-      - name: prepare crowdin client
+      - name: Prepare crowdin client
         run: |
           wget --quiet https://artifacts.crowdin.com/repo/deb/crowdin3.deb -O crowdin.deb
           sudo dpkg -i crowdin.deb
 
-      - name: download translations
+      - name: Download translations
         env:
           CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
         run: |
           crowdin download --config .crowdin.yaml -b main
 
-      - name: add new translations
+      - name: Add new translations
         run: |
           git add src/i18n/org/opencastproject/adminui/languages/
 
-      - name: upload translations
+      - name: Upload translations
         run: |
           if git commit -m "Automatically update translation keys"; then
             git push

.github/workflows/crowdin-download-translations.yml

@@ -11,18 +11,18 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  deploy-translation-keys:
+  upload-translation-keys:
     if: github.repository_owner == 'opencast'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
-    - name: prepare crowdin client
+    - name: Prepare crowdin client
       run: |
         wget --quiet https://artifacts.crowdin.com/repo/deb/crowdin3.deb
         sudo dpkg -i crowdin3.deb
 
-    - name: upload translation source
+    - name: Upload translation source
       env:
         CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
       run: |

.github/workflows/crowdin-upload-keys.yml

@@ -1,4 +1,4 @@
-name: Build & Deploy main brances
+name: Build » Deploy main branches
 
 on:
   push:
@@ -11,15 +11,15 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  detect:
+  detect-repo-owner:
     if: github.repository_owner == 'opencast'
     runs-on: ubuntu-latest
     outputs:
       server: ${{ steps.test-server.outputs.server }}
       branch: ${{ steps.branch-name.outputs.branch }}
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Determine the correct test server
         id: test-server
@@ -33,44 +33,46 @@ jobs:
           #Strip the r/ prefix, giving us just 17.x.  If this is main/develop this does nothing
           echo "branch=${TEMP#r\/}" >> $GITHUB_OUTPUT
 
-  main:
+  deploy-main-branches:
     runs-on: ubuntu-latest
-    needs: detect
+    needs: detect-repo-owner
     steps:
-      - name: checkout code
-        uses: actions/checkout@v4
+      - name: Checkout sources
+        uses: actions/checkout@v5
 
-      - name: get node.js
-        uses: actions/setup-node@v4
+      - name: Get Node.js
+        uses: actions/setup-node@v5
         with:
           node-version: 20
 
-      - name: download dependencies
+      - name: Run npm ci
         run: npm ci
 
-      - name: build project
+      - name: Build the app
         run: |
           npm run build
         env:
-          VITE_TEST_SERVER_URL: ${{needs.detect.outputs.server}}
+          VITE_TEST_SERVER_URL: ${{needs.detect-repo-owner.outputs.server}}
           NODE_ENV: development
           VITE_TEST_SERVER_AUTH: "admin:opencast"
 
-
       - name: Prepare git
         run: |
-          git config --global user.name "Release Bot"
+          git config --global user.name "Admin Interface Deployment Bot"
           git config --global user.email "cloud@opencast.org"
 
       - name: Commit new version
         run: |
+          # Save the current assets from the main branch
+          mv .github/assets assets_temp
+          # Update and change to the gh-pages branch
           git fetch --unshallow origin gh-pages
           git checkout gh-pages
           # Update gh-pages
           rm -rf $BRANCH
           mv build $BRANCH
           #Generate an index, in case anyone lands at the root of the test domain
-          echo '<html><body><ul>' > index.html
+          echo $'<html><head><link rel=stylesheet type=text/css href=assets/index.css /></head><body><div class="head-container"><img src=assets/opencast-white.svg /></div><div class="navbar-container"></div><div class="text-container"><p>Deployment for the latest development versions of the Opencast admin interface.The branches listed here correspond to Opencast\'s own branches.</br><b>Please select a version.</b></p></div><ul>' > index.html
           find . -mindepth 1 -maxdepth 1 -type d \
             | grep '[0-9]*.x\|develop' \
             | sort -r \
@@ -79,7 +81,16 @@ jobs:
           git add $BRANCH index.html
           git diff --staged --quiet || git commit --amend -m "Build $(date)"
         env:
-          BRANCH: ${{needs.detect.outputs.branch}}
+          BRANCH: ${{needs.detect-repo-owner.outputs.branch}}
+
+      - name: update CSS and other assets
+        if: github.ref == 'refs/heads/develop'
+        run: |
+          rm -rf assets
+          mv assets_temp assets
+          git add assets
+          git diff --staged --quiet || git commit --amend -m "Build $(date)"
+
 
       - name: Push updates
         run: git push origin gh-pages --force