Skip to content

Commit 9dbf865

Browse files
gregorydlogangregorydlogan
committed
Merge remote-tracking branch 'upstream/r/17.x' into t/rework-workflows
2 parents 7dae4b2 + 0cfbfed commit 9dbf865

19 files changed

Lines changed: 716 additions & 387 deletions

‎.github/assets/index.css‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
@media (prefers-color-scheme: light) {
2+
:root {
3+
--header-color: linear-gradient(to bottom,#388ed6,#2075b1);
4+
--bg-color: #fafafa;
5+
--text-color: #0F0F0F;
6+
--container-color: #fafafa;
7+
--boxShadow-color: #0000004d;
8+
--border-color: #1d3041;
9+
--navbar-color: #24425c;
10+
--item-color: #ebeef1;
11+
--item-border: #c9d0d6;
12+
--item-hover: linear-gradient(to bottom, #fafafa, #e8ebef);
13+
--item-inner-boxShadow-color: #0000000d;
14+
--item-boxShadow-color: #96969626;
15+
}
16+
}
17+
18+
body {
19+
margin: 0px;
20+
background: var(--bg-color, #F8F4F1);
21+
font-family: Roboto Flex Variable, Roboto, -apple-system, BlinkMacSystemFont, Segoe UI, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
22+
}
23+
24+
/* Text Container */
25+
.text-container {
26+
/* Layout */
27+
margin: 3% auto;
28+
max-width: 75%;
29+
padding: 10px 15px 10px 15px;
30+
31+
/* Styling */
32+
border-radius: 5px;
33+
background: var(--container-color, #F8F4F1);
34+
box-shadow: 0 1px 3px 1px var(--boxShadow-color, #0000004d);
35+
}
36+
.text-container > p {
37+
color: var(--text-color, #0F0F0F);
38+
text-align: center;
39+
font-size: 20px;
40+
font-weight: 400;
41+
}
42+
43+
/* Header */
44+
.head-container {
45+
width: 100%;
46+
height: 50px;
47+
box-shadow: 0 1px 3px 1px var(--boxShadow-color, #0000004d);
48+
position: relative;
49+
border-bottom: 1px solid var(--border-color, #1d3041);
50+
background: var(--header-color, linear-gradient(to bottom,#388ed6,#2075b1));
51+
52+
}
53+
.head-container > img {
54+
/*Image Style*/
55+
width: 100px;
56+
height: 20px;
57+
padding: 14px 20px 13px;
58+
}
59+
.navbar-container {
60+
width: 100%;
61+
min-height: 80px;
62+
background: var(--navbar-color, #24425c);
63+
}
64+
65+
/* Version-List */
66+
ul {
67+
list-style-type: none;
68+
display: flex;
69+
justify-content: center;
70+
align-items: center;
71+
flex-wrap: wrap;
72+
column-gap: 20px;
73+
row-gap: 10px;
74+
}
75+
76+
li {
77+
width: 160px;
78+
text-align: center;
79+
padding: 15px 10px;
80+
border-radius: 4px;
81+
border: 1px solid var(--item-border, #c9d0d6);
82+
background: var(--item-color, #ebeef1);
83+
box-shadow: inset 0 3px 10px 2px var(--item-inner-boxShadow-color, #0000000d), 0px 5px 10px 0px var(--item-boxShadow-color, #96969626);
84+
}
85+
86+
li:hover {
87+
background: var(--item-hover, linear-gradient(to bottom, #fafafa, #e8ebef));
88+
}
89+
90+
li > a {
91+
color: var(--text-color, #0F0F0F);
92+
font-size: 18px;
93+
font-weight: 400;
94+
text-decoration: none;
95+
padding:15px 50px;
96+
}

‎.github/assets/opencast-white.svg‎

Lines changed: 72 additions & 0 deletions
Loading

‎.github/workflows/deploy-main-branches.yml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,23 @@ jobs:
5656
NODE_ENV: development
5757
VITE_TEST_SERVER_AUTH: "admin:opencast"
5858

59-
6059
- name: Prepare git
6160
run: |
6261
git config --global user.name "Admin Interface Deployment Bot"
6362
git config --global user.email "cloud@opencast.org"
6463
6564
- name: Commit new version
6665
run: |
66+
# Save the current assets from the main branch
67+
mv .github/assets assets_temp
68+
# Update and change to the gh-pages branch
6769
git fetch --unshallow origin gh-pages
6870
git checkout gh-pages
6971
# Update gh-pages
7072
rm -rf $BRANCH
7173
mv build $BRANCH
7274
#Generate an index, in case anyone lands at the root of the test domain
73-
echo '<html><body><ul>' > index.html
75+
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
7476
find . -mindepth 1 -maxdepth 1 -type d \
7577
| grep '[0-9]*.x\|develop' \
7678
| sort -r \
@@ -81,5 +83,14 @@ jobs:
8183
env:
8284
BRANCH: ${{needs.detect-repo-owner.outputs.branch}}
8385

86+
- name: update CSS and other assets
87+
if: github.ref == 'refs/heads/develop'
88+
run: |
89+
rm -rf assets
90+
mv assets_temp assets
91+
git add assets
92+
git diff --staged --quiet || git commit --amend -m "Build $(date)"
93+
94+
8495
- name: Push updates
8596
run: git push origin gh-pages --force

‎src/components/configuration/partials/ThemesDateTimeCell.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ const ThemesDateTimeCell = ({
1515

1616
return (
1717
// Link template for creation date of themes
18-
<span>
18+
<>
1919
{t("dateFormats.date.short", {
2020
date: row.creationDate ? renderValidDate(row.creationDate) : "",
2121
})}
22-
</span>
22+
</>
2323
);
2424
};
2525

‎src/components/events/Events.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ const Events = () => {
5555
const editMetadataEventsModalRef = useRef<ModalHandle>(null);
5656

5757
const user = useAppSelector(state => getUserInformation(state));
58-
const showActions = useAppSelector(state => isShowActions(state));
5958
const events = useAppSelector(state => getTotalEvents(state));
6059
const isFetchingAssetUploadOptions = useAppSelector(state => getIsFetchingAssetUploadOptions(state));
6160

@@ -214,7 +213,7 @@ const Events = () => {
214213
text: "BULK_ACTIONS.EDIT_EVENTS_METADATA.CAPTION",
215214
}
216215
]}
217-
disabled={!showActions}
216+
isShowActions={isShowActions}
218217
/>
219218
{/* Include filters component*/}
220219
<TableFilters

‎src/components/events/Series.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ const Series = () => {
4444
let location = useLocation();
4545

4646
const series = useAppSelector(state => getTotalSeries(state));
47-
const showActions = useAppSelector(state => isShowActions(state));
4847

4948
useEffect(() => {
5049
// State variable for interrupting the load function
@@ -139,7 +138,7 @@ const Series = () => {
139138
text: "BULK_ACTIONS.DELETE.SERIES.CAPTION",
140139
},
141140
]}
142-
disabled={!showActions}
141+
isShowActions={isShowActions}
143142
/>
144143
{/* Include filters component */}
145144
<TableFilters

‎src/components/events/partials/EventsEndCell.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const EventsEndCell = ({
1515

1616
return (
1717
// Link template for start date of event
18-
<span>{t("dateFormats.time.short", { time: renderValidDate(row.end_date) })}</span>
18+
<>{t("dateFormats.time.short", { time: renderValidDate(row.end_date) })}</>
1919
);
2020
};
2121
export default EventsEndCell;

‎src/components/events/partials/EventsLocationCell.tsx‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,18 @@ const EventsLocationCell = ({
3030
};
3131

3232
return (
33-
// Link template for location of event
34-
<ButtonLikeAnchor
35-
onClick={() => addFilter(row.location)}
36-
className={"crosslink"}
37-
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.LOCATION"} // Disabled due to performance concerns
38-
>
39-
{row.location}
40-
</ButtonLikeAnchor>
33+
<>
34+
{ row.location &&
35+
// Link template for location of event
36+
<ButtonLikeAnchor
37+
onClick={() => addFilter(row.location)}
38+
className={"crosslink"}
39+
// tooltipText={"EVENTS.EVENTS.TABLE.TOOLTIP.LOCATION"} // Disabled due to performance concerns
40+
>
41+
{row.location}
42+
</ButtonLikeAnchor>
43+
}
44+
</>
4145
);
4246
};
4347

‎src/components/events/partials/EventsStartCell.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ const EventsStartCell = ({
1515

1616
return (
1717
// Link template for start date of event
18-
<span>
19-
{t("dateFormats.time.short", { time: renderValidDate(row.start_date) })}
20-
</span>
18+
<>{t("dateFormats.time.short", { time: renderValidDate(row.start_date) })}</>
2119
);
2220
};
2321

‎src/components/events/partials/ModalTabsAndPages/EventDetailsSchedulingTab.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ const EventDetailsSchedulingTab = ({
305305
yearDropdownItemNumber={2}
306306
dateFormat="P"
307307
popperClassName="datepicker-custom"
308-
className="datepicker-custom-input"
309308
wrapperClassName="datepicker-custom-wrapper"
310309
locale={currentLanguage?.dateLocale}
311310
strictParsing

0 commit comments

Comments
 (0)