Skip to content

Commit acb9ad5

Browse files
AnjuJose011AnjuJose011
authored
Merge pull request #734 from TechnologyEnhancedLearning/RC
Merge RC changes to release -V1.0.0
2 parents af256dd + b3a3735 commit acb9ad5

File tree

7 files changed

+102
-34
lines changed

7 files changed

+102
-34
lines changed

‎AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div>
33
<div class="toolBarBox">
44
<div class="toolBar">
5-
<div :style="getStatusStyle()" class="mr-4 p-3">
5+
<div :style="getStatusStyle()" class="mr-1 p-2">
66
<i :class="contentLib.getPageSectionStatusIcon(this.pageSection.pageSectionDetail)"></i>
77
{{ contentLib.getPageSectionStatusText(this.pageSection.pageSectionDetail) }}
88
</div>
@@ -167,8 +167,8 @@
167167
methods: {
168168
getStatusStyle(): string {
169169
return this.pageSection.pageSectionDetail.pageSectionStatus === PageSectionStatus.Live
170-
? 'background: #007F3B; height: 45px; margin: -8px;border: 1px solid #FFFFFF;'
171-
: ((this.pageSection.pageSectionDetail.deletePending == null || !this.pageSection.pageSectionDetail.deletePending) ? 'background: #FFB81C; height: 45px; margin: -8px;border: 1px solid #FFFFFF;color: #425563;' : 'background: #DA291C; height: 45px; margin: -8px; border: 1px solid #FFFFFF;');
170+
? 'background: #007F3B; height: 50px; margin: -12px;border: 1px solid #FFFFFF;'
171+
: ((this.pageSection.pageSectionDetail.deletePending == null || !this.pageSection.pageSectionDetail.deletePending) ? 'background: #FFB81C; height: 50px; margin: -12px;border: 1px solid #FFFFFF;color: #425563;' : 'background: #DA291C; height: 50px; margin: -12px; border: 1px solid #FFFFFF;');
172172
},
173173
getStatusIconStyle(): string {
174174
return 'margin-top:20px;'
@@ -215,8 +215,9 @@
215215
216216
.toolBarBox {
217217
position: absolute;
218-
right: 20px;
219-
top: 20px;
218+
right: 12px;
219+
left:10px;
220+
top: 2px;
220221
z-index: 1;
221222
}
222223
@@ -237,7 +238,7 @@
237238
.toolBar {
238239
display: flex;
239240
padding: 16px;
240-
height: 64px;
241+
height: 60px;
241242
float: right;
242243
background: $nhsuk-grey;
243244
border: 2px solid $nhsuk-white;
@@ -269,4 +270,14 @@
269270
.toolBarButton i .fa, .fas {
270271
font-weight: 100;
271272
}
273+
@media (max-width: 420px) {
274+
.toolBarBox {
275+
position: absolute;
276+
right: 12px;
277+
left: 10px;
278+
top: 2px;
279+
z-index: 1;
280+
width: fit-content;
281+
}
282+
}
272283
</style>

‎AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/upload/fileValidation.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const file_size_validation = (value: any) => {
88
export const file_extension_validation = (value: any) => {
99
if (!value) { return true; }
1010
let fileExtension = value.name.split(".").pop();
11-
let fileType = ['mp4', 'avi', 'm4v', 'mov', 'mkv', 'mpg', 'm2v', 'vob'].find(ext => ext == fileExtension);
11+
let fileType = ['mp4', 'avi', 'm4v', 'mov', 'mkv', 'mpg', 'm2v', 'vob','wmv'].find(ext => ext == fileExtension);
1212
return fileType != undefined;
1313
};
1414
export const transcriptfile_extension_validation = (value: any) => {

‎AdminUI/LearningHub.Nhs.AdminUI/Styles/Layout/_footer.scss‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,13 @@
2828

2929
.footer-primary,
3030
.footer-secondary {
31-
font-size: 17px;
32-
line-height: 28px;
33-
padding-top: 30px;
31+
font-size: 17px;
32+
line-height: 28px;
33+
padding-top: 30px;
34+
35+
@media (max-width: 420px) {
36+
padding-top: 20px !important;
37+
}
3438
}
3539

3640
.footer-primary {
@@ -63,7 +67,7 @@
6367
padding-right: 15px;
6468

6569
@media (max-width: 420px) {
66-
padding-top: 10px !important;
70+
padding-top: 0px !important;
6771
text-align: left !important;
6872
}
6973
}

‎AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
display: -webkit-box;
9090
display: -ms-flexbox;
9191
display: flex;
92-
margin: 1em 0
92+
margin: .5em 0
9393
}
9494

9595
.bmpui-ui-controlbar .bmpui-controlbar-top .bmpui-ui-label {
@@ -563,7 +563,7 @@
563563

564564
.bmpui-ui-seekbar, .bmpui-ui-volumeslider {
565565
cursor: pointer;
566-
font-size: 0.2em;
566+
font-size: 1em;
567567
height: 1em;
568568
position: relative;
569569
width: 100%
@@ -684,7 +684,7 @@
684684

685685
.bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay {
686686
bottom: 0;
687-
font-size: 1em;
687+
font-size: 1.2em;
688688
left: 0;
689689
pointer-events: none;
690690
position: absolute;
@@ -1871,3 +1871,37 @@
18711871
.bmpui-ui-uicontainer.bmpui-layout-max-width-400 .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-uicontainer.bmpui-layout-max-width-400 .bmpui-ui-watermark, .bmpui-ui-uicontainer.bmpui-layout-max-width-600 .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-uicontainer.bmpui-layout-max-width-600 .bmpui-ui-watermark {
18721872
font-size: .7em
18731873
}
1874+
@media (max-width: 767px) {
1875+
.bmpui-ui-buffering-overlay,
1876+
.bmpui-ui-cast-status-overlay,
1877+
.bmpui-ui-container,
1878+
.bmpui-ui-controlbar,
1879+
.bmpui-ui-errormessage-overlay,
1880+
.bmpui-ui-listbox,
1881+
.bmpui-ui-playbacktoggle-overlay,
1882+
.bmpui-ui-recommendation-overlay,
1883+
.bmpui-ui-seekbar-label,
1884+
.bmpui-ui-settings-panel,
1885+
.bmpui-ui-subtitle-overlay.bmpui-fontsize-100 .bmpui-ui-subtitle-label,
1886+
.bmpui-ui-titlebar,
1887+
.bmpui-ui-uicontainer,
1888+
.bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay,
1889+
.bmpui-ui-volumecontrolbutton {
1890+
font-size: 0.7em;
1891+
}
1892+
}
1893+
1894+
@media (max-width: 767px) {
1895+
.bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay {
1896+
bottom: 0;
1897+
font-size: 1em;
1898+
left: 0;
1899+
pointer-events: none;
1900+
position: absolute;
1901+
right: 0;
1902+
text-align: center;
1903+
top: 0;
1904+
-webkit-transition: bottom .15s ease-out;
1905+
transition: bottom .15s ease-out
1906+
}
1907+
}

‎LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
display: -webkit-box;
9090
display: -ms-flexbox;
9191
display: flex;
92-
margin: 1em 0
92+
margin: .5em 0
9393
}
9494

9595
.bmpui-ui-controlbar .bmpui-controlbar-top .bmpui-ui-label {
@@ -563,7 +563,7 @@
563563

564564
.bmpui-ui-seekbar, .bmpui-ui-volumeslider {
565565
cursor: pointer;
566-
font-size: 0.2em;
566+
font-size: 1em;
567567
height: 1em;
568568
position: relative;
569569
width: 100%
@@ -684,7 +684,7 @@
684684

685685
.bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay {
686686
bottom: 0;
687-
font-size: 1em;
687+
font-size: 1.2em;
688688
left: 0;
689689
pointer-events: none;
690690
position: absolute;
@@ -1871,3 +1871,37 @@
18711871
.bmpui-ui-uicontainer.bmpui-layout-max-width-400 .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-uicontainer.bmpui-layout-max-width-400 .bmpui-ui-watermark, .bmpui-ui-uicontainer.bmpui-layout-max-width-600 .bmpui-ui-hugeplaybacktogglebutton, .bmpui-ui-uicontainer.bmpui-layout-max-width-600 .bmpui-ui-watermark {
18721872
font-size: .7em
18731873
}
1874+
@media (max-width: 767px) {
1875+
.bmpui-ui-buffering-overlay,
1876+
.bmpui-ui-cast-status-overlay,
1877+
.bmpui-ui-container,
1878+
.bmpui-ui-controlbar,
1879+
.bmpui-ui-errormessage-overlay,
1880+
.bmpui-ui-listbox,
1881+
.bmpui-ui-playbacktoggle-overlay,
1882+
.bmpui-ui-recommendation-overlay,
1883+
.bmpui-ui-seekbar-label,
1884+
.bmpui-ui-settings-panel,
1885+
.bmpui-ui-subtitle-overlay.bmpui-fontsize-100 .bmpui-ui-subtitle-label,
1886+
.bmpui-ui-titlebar,
1887+
.bmpui-ui-uicontainer,
1888+
.bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay,
1889+
.bmpui-ui-volumecontrolbutton {
1890+
font-size: 0.7em;
1891+
}
1892+
}
1893+
1894+
@media (max-width: 767px) {
1895+
.bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay {
1896+
bottom: 0;
1897+
font-size: 1em;
1898+
left: 0;
1899+
pointer-events: none;
1900+
position: absolute;
1901+
right: 0;
1902+
text-align: center;
1903+
top: 0;
1904+
-webkit-transition: bottom .15s ease-out;
1905+
transition: bottom .15s ease-out
1906+
}
1907+
}

‎WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/UpdateFileTypes.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
update resources.FileType set NotAllowed =1 where Extension='webm'
1+
update resources.FileType set NotAllowed =0 where Extension='WMV'

‎WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,7 @@ public async Task DeleteBlockCollection(int userId, int blockCollectionId)
8383

8484
foreach (var id in collectionIds)
8585
{
86-
_ = Task.Run(async () =>
87-
{
88-
var lhContext = new LearningHubDbContext(this.DbContext.Options);
89-
try
90-
{
91-
await lhContext.Database.ExecuteSqlRawAsync("resources.BlockCollectionDelete @p0", new SqlParameter("@p0", SqlDbType.Int) { Value = id });
92-
}
93-
catch (Exception ex)
94-
{
95-
throw new Exception(ex.Message);
96-
}
97-
finally
98-
{
99-
await lhContext.DisposeAsync();
100-
}
101-
});
86+
await this.DbContext.Database.ExecuteSqlRawAsync("resources.BlockCollectionDelete @p0", new SqlParameter("@p0", SqlDbType.Int) { Value = id });
10287
}
10388
}
10489

0 commit comments

Comments
 (0)