Skip to content

Commit 4677c7d

Browse files
dmolsdmols
authored
Merge pull request ucfopen#1102 from mbusch3/post-merge-cleanup
PHP scanner fixes, plus quick layout tweaks that were lost in the merge.
2 parents 704d8ac + 63d33b5 commit 4677c7d

6 files changed

Lines changed: 90 additions & 85 deletions

File tree

‎assets/css/udoit4-theme.css‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,11 @@
192192
font-weight: 600;
193193
line-height: normal;
194194
color: var(--text-color);
195+
196+
&:focus {
197+
outline: 2px solid var(--focus-color);
198+
outline-offset: 3px;
199+
}
195200
}
196201

197202
.pageTitle {
@@ -231,6 +236,17 @@
231236
}
232237
}
233238

239+
a {
240+
color: var(--link-color);
241+
font-weight: 300;
242+
243+
&:focus {
244+
outline: 2px solid var(--focus-color);
245+
outline-offset: 3px;
246+
border-radius: 2px;
247+
}
248+
}
249+
234250
button {
235251
font-family: var(--heading-font-family);
236252
padding: .5rem 1rem;
@@ -559,6 +575,7 @@
559575
h2 {
560576
line-height: normal;
561577
align-self: center;
578+
margin: 0;
562579
}
563580

564581
.close-icon {

‎assets/js/Components/FixIssuesPage.js‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -822,16 +822,11 @@ export default function FixIssuesPage({
822822
setLiveUpdateToggle(!liveUpdateToggle)
823823
}
824824

825-
const isDialogOpen = () => {
826-
const dialog = document.getElementById(dialogId)
827-
return dialog && dialog.open
828-
}
829-
830825
const openDialog = () => {
831826
setWidgetState(WIDGET_STATE.FIXIT)
832827

833828
const dialog = document.getElementById(dialogId)
834-
if(dialog) {
829+
if(dialog && !dialog.open) {
835830
dialog.showModal()
836831

837832
const title = dialog.querySelector('#dialog-title')

‎assets/js/Components/SettingsPage.css‎

Lines changed: 62 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,83 @@
11
@layer udoit-component {
22

3-
h2 {
4-
margin: 0 0 .5rem 0;
5-
}
6-
7-
a {
8-
color: var(--link-color);
9-
font-weight: 300;
3+
.settings-page-container {
104

11-
&:focus {
12-
outline: 2px solid var(--focus-color);
13-
outline-offset: 3px;
14-
border-radius: 2px;
5+
h2 {
6+
margin: 0 0 .5rem 0;
157
}
16-
}
178

18-
.page-container {
19-
display: flex;
20-
flex-direction: row;
21-
gap: 1rem;
22-
width: 100%;
23-
flex-wrap: wrap;
24-
padding-block-end: 1rem;
25-
justify-content: center;
26-
27-
.settings-column {
9+
.page-container {
2810
display: flex;
29-
flex-direction: column;
30-
flex: 1 1 auto;
31-
width: 60%;
32-
max-width: 50em;
11+
flex-direction: row;
12+
gap: 1rem;
13+
width: 100%;
14+
flex-wrap: wrap;
15+
padding-block-end: 1rem;
16+
justify-content: center;
3317

34-
.settings-container {
35-
padding: 1.5rem;
36-
height: fit-content;
18+
.settings-column {
19+
display: flex;
20+
flex-direction: column;
21+
flex: 1 1 auto;
22+
width: 60%;
23+
max-width: 50em;
3724

38-
.settings-row {
39-
display: flex;
40-
flex-direction: row;
41-
gap: .5rem;
42-
justify-content: space-between;
43-
flex-wrap: wrap;
44-
align-items: center;
45-
margin: .5rem 0;
25+
.settings-container {
26+
padding: 1.5rem;
27+
height: fit-content;
4628

47-
label {
48-
color: var(--text-secondary-color);
29+
.settings-row {
30+
display: flex;
31+
flex-direction: row;
32+
gap: .5rem;
33+
justify-content: space-between;
34+
flex-wrap: wrap;
35+
align-items: center;
36+
margin: .5rem 0;
37+
38+
label {
39+
color: var(--text-secondary-color);
40+
}
4941
}
50-
}
5142

52-
.divider {
53-
border-top: 1px solid var(--border-color);
54-
margin: 1.5rem -1.5rem;
55-
}
43+
.divider {
44+
border-top: 1px solid var(--border-color);
45+
margin: 1.5rem -1.5rem;
46+
}
5647

57-
.combo-container {
58-
width: 18em;
59-
max-width: 100%;
48+
.combo-container {
49+
width: 18em;
50+
max-width: 100%;
51+
}
6052
}
6153
}
62-
}
63-
64-
.about-column {
65-
display: flex;
66-
flex-direction: column;
67-
gap: 1rem;
68-
width: 60%;
69-
max-width: 50em;
70-
flex: 1 1;
71-
justify-content: center;
7254

73-
.callout-container {
74-
padding: 1.5rem;
55+
.about-column {
56+
display: flex;
57+
flex-direction: column;
58+
gap: 1rem;
59+
width: 60%;
60+
max-width: 50em;
7561
flex: 1 1;
76-
box-sizing: content-box;
77-
min-width: 25rem;
78-
max-width: 100%;
79-
height: fit-content;
62+
justify-content: center;
8063

81-
.udoit-logo {
82-
width: 100%;
83-
max-width: 150px;
84-
margin: 0;
85-
}
64+
.callout-container {
65+
padding: 1.5rem;
66+
flex: 1 1;
67+
box-sizing: content-box;
68+
min-width: 25rem;
69+
max-width: 100%;
70+
height: fit-content;
8671

87-
.version-number {
88-
margin-top: -.5rem;
72+
.udoit-logo {
73+
width: 100%;
74+
max-width: 150px;
75+
margin: 0;
76+
}
77+
78+
.version-number {
79+
margin-top: -.5rem;
80+
}
8981
}
9082
}
9183
}

‎assets/js/Components/SettingsPage.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ export default function SettingsPage({
157157

158158
<div className="callout-container flex-column gap-2">
159159
<h2>{t('settings.title.disclaimer')}</h2>
160-
<p className="m=0">{t('settings.text.disclaimer')}</p>
160+
<p className="m-0">{t('settings.text.disclaimer')}</p>
161161
</div>
162162
</div>
163163
</div>

‎src/Controller/SyncController.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@ private function executeScan(Course $course, LmsFetchService $lmsFetch, bool $fo
8181
$reportArr['contentItems'] = $course->getContentItems();
8282
$reportArr['contentSections'] = $lmsFetch->getCourseSections($course, $user);
8383

84-
$reportArr['instructors'] = $this->getInstructorNamesForCourse(
85-
$course,
86-
$user,
87-
$courseUserRepo,
88-
$userRepo,
89-
$em,
90-
$lmsApi
91-
);
84+
// $reportArr['instructors'] = $this->getInstructorNamesForCourse(
85+
// $course,
86+
// $user,
87+
// $courseUserRepo,
88+
// $userRepo,
89+
// $em,
90+
// $lmsApi
91+
// );
9292

9393
$response->setData($reportArr);
9494

‎src/Lms/Canvas/CanvasLms.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ public function updateCourseData(Course $course, User $user)
352352
// Get content from Canvas and update content items
353353
public function updateCourseContent(Course $course, User $user, $force = false): array
354354
{
355+
$output = new ConsoleOutput();
355356
$this->contentItemList = [];
356357
$urls = $this->getCourseContentUrls($course->getLmsCourseId());
357358
$apiDomain = $this->getApiDomain($user);

0 commit comments

Comments
 (0)