diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue index d091b8081..4d1faf9b0 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/pageSectionToolbar.vue @@ -2,7 +2,7 @@
-
+
{{ contentLib.getPageSectionStatusText(this.pageSection.pageSectionDetail) }}
@@ -167,8 +167,8 @@ methods: { getStatusStyle(): string { return this.pageSection.pageSectionDetail.pageSectionStatus === PageSectionStatus.Live - ? 'background: #007F3B; height: 45px; margin: -8px;border: 1px solid #FFFFFF;' - : ((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;'); + ? 'background: #007F3B; height: 50px; margin: -12px;border: 1px solid #FFFFFF;' + : ((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;'); }, getStatusIconStyle(): string { return 'margin-top:20px;' @@ -215,8 +215,9 @@ .toolBarBox { position: absolute; - right: 20px; - top: 20px; + right: 12px; + left:10px; + top: 2px; z-index: 1; } @@ -237,7 +238,7 @@ .toolBar { display: flex; padding: 16px; - height: 64px; + height: 60px; float: right; background: $nhsuk-grey; border: 2px solid $nhsuk-white; @@ -269,4 +270,14 @@ .toolBarButton i .fa, .fas { font-weight: 100; } + @media (max-width: 420px) { + .toolBarBox { + position: absolute; + right: 12px; + left: 10px; + top: 2px; + z-index: 1; + width: fit-content; + } + } \ No newline at end of file diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/upload/fileValidation.ts b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/upload/fileValidation.ts index c92d88b7e..a950f3a21 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/upload/fileValidation.ts +++ b/AdminUI/LearningHub.Nhs.AdminUI/Scripts/vuesrc/content/upload/fileValidation.ts @@ -8,7 +8,7 @@ export const file_size_validation = (value: any) => { export const file_extension_validation = (value: any) => { if (!value) { return true; } let fileExtension = value.name.split(".").pop(); - let fileType = ['mp4', 'avi', 'm4v', 'mov', 'mkv', 'mpg', 'm2v', 'vob'].find(ext => ext == fileExtension); + let fileType = ['mp4', 'avi', 'm4v', 'mov', 'mkv', 'mpg', 'm2v', 'vob','wmv'].find(ext => ext == fileExtension); return fileType != undefined; }; export const transcriptfile_extension_validation = (value: any) => { diff --git a/AdminUI/LearningHub.Nhs.AdminUI/Styles/Layout/_footer.scss b/AdminUI/LearningHub.Nhs.AdminUI/Styles/Layout/_footer.scss index 3423503ae..c372b4b21 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/Styles/Layout/_footer.scss +++ b/AdminUI/LearningHub.Nhs.AdminUI/Styles/Layout/_footer.scss @@ -28,9 +28,13 @@ .footer-primary, .footer-secondary { - font-size: 17px; - line-height: 28px; - padding-top: 30px; + font-size: 17px; + line-height: 28px; + padding-top: 30px; + + @media (max-width: 420px) { + padding-top: 20px !important; + } } .footer-primary { @@ -63,7 +67,7 @@ padding-right: 15px; @media (max-width: 420px) { - padding-top: 10px !important; + padding-top: 0px !important; text-align: left !important; } } diff --git a/AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css b/AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css index 7cd3f44d9..0929e5a25 100644 --- a/AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css +++ b/AdminUI/LearningHub.Nhs.AdminUI/wwwroot/css/mkplayer-ui.css @@ -89,7 +89,7 @@ display: -webkit-box; display: -ms-flexbox; display: flex; - margin: 1em 0 + margin: .5em 0 } .bmpui-ui-controlbar .bmpui-controlbar-top .bmpui-ui-label { @@ -563,7 +563,7 @@ .bmpui-ui-seekbar, .bmpui-ui-volumeslider { cursor: pointer; - font-size: 0.2em; + font-size: 1em; height: 1em; position: relative; width: 100% @@ -684,7 +684,7 @@ .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay { bottom: 0; - font-size: 1em; + font-size: 1.2em; left: 0; pointer-events: none; position: absolute; @@ -1871,3 +1871,37 @@ .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 { font-size: .7em } +@media (max-width: 767px) { + .bmpui-ui-buffering-overlay, + .bmpui-ui-cast-status-overlay, + .bmpui-ui-container, + .bmpui-ui-controlbar, + .bmpui-ui-errormessage-overlay, + .bmpui-ui-listbox, + .bmpui-ui-playbacktoggle-overlay, + .bmpui-ui-recommendation-overlay, + .bmpui-ui-seekbar-label, + .bmpui-ui-settings-panel, + .bmpui-ui-subtitle-overlay.bmpui-fontsize-100 .bmpui-ui-subtitle-label, + .bmpui-ui-titlebar, + .bmpui-ui-uicontainer, + .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay, + .bmpui-ui-volumecontrolbutton { + font-size: 0.7em; + } +} + +@media (max-width: 767px) { + .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay { + bottom: 0; + font-size: 1em; + left: 0; + pointer-events: none; + position: absolute; + right: 0; + text-align: center; + top: 0; + -webkit-transition: bottom .15s ease-out; + transition: bottom .15s ease-out + } +} diff --git a/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css b/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css index 7cd3f44d9..df6bc583f 100644 --- a/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css +++ b/LearningHub.Nhs.WebUI/wwwroot/css/mkplayer-ui.css @@ -89,7 +89,7 @@ display: -webkit-box; display: -ms-flexbox; display: flex; - margin: 1em 0 + margin: .5em 0 } .bmpui-ui-controlbar .bmpui-controlbar-top .bmpui-ui-label { @@ -563,7 +563,7 @@ .bmpui-ui-seekbar, .bmpui-ui-volumeslider { cursor: pointer; - font-size: 0.2em; + font-size: 1em; height: 1em; position: relative; width: 100% @@ -684,7 +684,7 @@ .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay { bottom: 0; - font-size: 1em; + font-size: 1.2em; left: 0; pointer-events: none; position: absolute; @@ -1871,3 +1871,37 @@ .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 { font-size: .7em } +@media (max-width: 767px) { + .bmpui-ui-buffering-overlay, + .bmpui-ui-cast-status-overlay, + .bmpui-ui-container, + .bmpui-ui-controlbar, + .bmpui-ui-errormessage-overlay, + .bmpui-ui-listbox, + .bmpui-ui-playbacktoggle-overlay, + .bmpui-ui-recommendation-overlay, + .bmpui-ui-seekbar-label, + .bmpui-ui-settings-panel, + .bmpui-ui-subtitle-overlay.bmpui-fontsize-100 .bmpui-ui-subtitle-label, + .bmpui-ui-titlebar, + .bmpui-ui-uicontainer, + .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay, + .bmpui-ui-volumecontrolbutton { + font-size: 0.7em; + } +} + +@media (max-width: 767px) { + .bmpui-ui-uicontainer .bmpui-ui-subtitle-overlay { + bottom: 0; + font-size: 1em; + left: 0; + pointer-events: none; + position: absolute; + right: 0; + text-align: center; + top: 0; + -webkit-transition: bottom .15s ease-out; + transition: bottom .15s ease-out + } +} \ No newline at end of file diff --git a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/UpdateFileTypes.sql b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/UpdateFileTypes.sql index cc5d1935b..f06588190 100644 --- a/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/UpdateFileTypes.sql +++ b/WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/UpdateFileTypes.sql @@ -1 +1 @@ -update resources.FileType set NotAllowed =1 where Extension='webm' \ No newline at end of file +update resources.FileType set NotAllowed =0 where Extension='WMV' \ No newline at end of file diff --git a/WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs index 554fdde25..a65b0ddb6 100644 --- a/WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs +++ b/WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs @@ -83,22 +83,7 @@ public async Task DeleteBlockCollection(int userId, int blockCollectionId) foreach (var id in collectionIds) { - _ = Task.Run(async () => - { - var lhContext = new LearningHubDbContext(this.DbContext.Options); - try - { - await lhContext.Database.ExecuteSqlRawAsync("resources.BlockCollectionDelete @p0", new SqlParameter("@p0", SqlDbType.Int) { Value = id }); - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - finally - { - await lhContext.DisposeAsync(); - } - }); + await this.DbContext.Database.ExecuteSqlRawAsync("resources.BlockCollectionDelete @p0", new SqlParameter("@p0", SqlDbType.Int) { Value = id }); } }