Merge pull request TechnologyEnhancedLearning#1147 from TechnologyEnhancedLearning/RC

Merge RC to master

Author: AnjuJose011

AdminUI/LearningHub.Nhs.AdminUI/Controllers/api/UserController.cs

@@ -571,6 +571,32 @@
                             </dl>
                         </div>
                     }
+                    @if (Model.ResourceTypeEnum == ResourceTypeEnum.Html)
+                    {
+                        <div class="col-12">
+                            <div class="id-container">Resource Reference ID: @Model.DefaultResourceReferenceId</div>
+                            <dl>
+                                <dt>Resource Version Id</dt>
+                                <dd>@Html.DisplayFor(model => model.ResourceVersionId)</dd>
+                                <dt>Resource Type</dt>
+                                <dd>
+                                    @Html.DisplayFor(model => model.ResourceTypeDescription)
+                                </dd>
+                                <dt>ESR Link</dt>
+                                <dd><a href="@Model.HtmlDetails.HostedContentUrl" target="_blank">@Model.HtmlDetails.HostedContentUrl</a></dd>
+                                @if (Model.HtmlDetails.File != null)
+                                {
+                                    <dt>Zip File</dt>
+                                    <dd>
+                                        <a href="@String.Format("{0}file/download/{1}/{2}", webSettings.Value.LearningHubAdminUrl, Model.HtmlDetails.File.FilePath, Model.HtmlDetails.File.FileName)" target="_blank" download>@Model.HtmlDetails.File.FileName</a>
+                                    </dd>
+                                }
+
+                                <dt>Content Folder</dt>
+                                <dd>@Model.HtmlDetails.ContentFilePath</dd>
+                            </dl>
+                        </div>
+                    }
 
                     @if (Model.ResourceTypeEnum == ResourceTypeEnum.Assessment)
                     {

AdminUI/LearningHub.Nhs.AdminUI/Views/Resource/Details.cshtml

@@ -78,14 +78,7 @@
     </environment>
     @*<script type="text/javascript" src="~/js/bundle/header.js"></script>*@
     <partial name="~/Views/Shared/_ValidationScriptsPartial.cshtml" />
-  
     @RenderSection("Scripts", required: false)
-    <script type="text/javascript" src="~/js/pageunload.js" asp-append-version="true"></script>
-    <script type="text/javascript">
-        // Bind the function to the unload event
-        window.onunload = tellServerBrowserClosed;
-
-    </script>
 </body>
 </html>
 <!-- Build number: @settings.Value.BuildNumber -->