Merge branch 'DLS-Release-v1.2.0' into UAT

Author: rshrirohit

DigitalLearningSolutions.Web/Views/Frameworks/Developer/Import/ApplyCompetencyOrdering.cshtml

@@ -38,7 +38,8 @@
                     </legend>
                     <div class="nhsuk-inset-text">
                         <span class="nhsuk-u-visually-hidden">Information: </span>
-                        <p>We strongly recommend including all framework competencies in your uploaded sheet if reordering competencies to ensure that the correct sequence is applied.</p>
+                        <p>We strongly recommend including all framework @Model.FrameworkVocabularyPlural.ToLower() in your uploaded sheet if reordering @Model.FrameworkVocabularyPlural.ToLower() to ensure that the correct sequence is applied.</p>
+                        <p>Note that if you split @Model.FrameworkVocabularySingular.ToLower() groups in your uploaded sheet, they will not be split in your framework but the order of groups may be affected.</p>
                     </div>
                     <div class="nhsuk-hint nhsuk-u-margin-bottom-2">
                         Your uploaded file includes changes to the order of existing @Model.FrameworkVocabularyPlural.ToLower(). Choose whether to store the changes to @Model.FrameworkVocabularySingular.ToLower() order during update.

DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml

@@ -2,20 +2,22 @@
 @model FrameworkViewModel;
 
 
-@if (Model.DetailFramework.UserRole > 1)
-{
-    <div class="nhsuk-grid-row nhsuk-u-margin-top-3">
-        <div class="nhsuk-grid-column-full">
+
+<div class="nhsuk-grid-row nhsuk-u-margin-top-3">
+    <div class="nhsuk-grid-column-full">
+        @if (Model.DetailFramework.UserRole > 1)
+        {
             <a class="nhsuk-button" asp-action="AddEditFrameworkCompetencyGroup" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add @Model.VocabSingular().ToLower() group</a>
             <a class="nhsuk-button nhsuk-button--secondary" asp-action="AddEditFrameworkCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add ungrouped @Model.VocabSingular().ToLower()</a>
             <a class="nhsuk-button nhsuk-button--secondary" asp-action="ImportCompetencies" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-isNotBlank="@(Model.FrameworkCompetencies.Any()|Model.FrameworkCompetencyGroups.Any())" asp-route-tabname="@(ViewContext.RouteData.Values["tabname"])">Bulk upload/update @Model.VocabPlural().ToLower()</a>
-            @if ((Model.FrameworkCompetencies?.Any() ?? false) || (Model.FrameworkCompetencyGroups?.Any(group => group.FrameworkCompetencies.Any()) ?? false) )
-            {
-              <a class="nhsuk-button nhsuk-button--secondary" asp-action="PrintLayout" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">View for print</a>
-            }
-        </div>
+        }
+        @if ((Model.FrameworkCompetencies?.Any() ?? false) || (Model.FrameworkCompetencyGroups?.Any(group => group.FrameworkCompetencies.Any()) ?? false))
+        {
+            <a class="nhsuk-button nhsuk-button--secondary" asp-action="PrintLayout" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">View for print</a>
+        }
     </div>
-}
+</div>
+
 <h2>Framework structure</h2>
 @if (Model.FrameworkCompetencyGroups.Any())
 {