Changed position of the story element in the left sidebar and deleted…

… the description/learning outcomes in edit story element.
ProjektAdLer · Mar 7, 2024 · 0de9ab2 · 0de9ab2
1 parent e1cd6cb
commit 0de9ab2
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 44 deletions.
diff --git a/Presentation/Components/Forms/Element/CreateElementForm.razor b/Presentation/Components/Forms/Element/CreateElementForm.razor
@@ -319,7 +319,8 @@
                                           Class="pb-4 mt-0"/>
                         </div>
                     </Collapsable>
-                </div>}
+                </div>
+        }
     </Fields>
 
     <FooterButtons>

diff --git a/Presentation/Components/Forms/Element/EditElementForm.razor b/Presentation/Components/Forms/Element/EditElementForm.razor
@@ -278,33 +278,37 @@
             </Collapsable>
         </div>
 
-        <div class="px-4">
-            <Collapsable Title=@Localizer["EditElementForm.Fields.Collapsable.Goals.Title"]     @bind-Collapsed="_collapsedGoals">
-                <div class="rounded-lg w-4/4 px-2 2xl:px-4 pb-2">
-                    <MudText Typo="Typo.caption">@Localizer["EditElementForm.Fields.Collapsable.Goals.Field.Goals.Text"]</MudText>
-                    <MudTextField @bind-Value="FormDataContainer.FormModel.Goals"
-                                  For="@(() => FormModel.Goals)"
-                                  Lines="3"
-                                  Variant="Variant.Outlined"
-                                  DebounceInterval="DebounceInterval"
-                                  Class="pb-2 mt-0"/>
+        @if (ElementMode != ElementMode.Story)
+        {
+            <div class="px-4">
+                <Collapsable
+                    Title=@Localizer["EditElementForm.Fields.Collapsable.Goals.Title"]     @bind-Collapsed="_collapsedGoals">
+                    <div class="rounded-lg w-4/4 px-2 2xl:px-4 pb-2">
+                        <MudText Typo="Typo.caption">@Localizer["EditElementForm.Fields.Collapsable.Goals.Field.Goals.Text"]</MudText>
+                        <MudTextField @bind-Value="FormDataContainer.FormModel.Goals"
+                                      For="@(() => FormModel.Goals)"
+                                      Lines="3"
+                                      Variant="Variant.Outlined"
+                                      DebounceInterval="DebounceInterval"
+                                      Class="pb-2 mt-0"/>
                 </div>
             </Collapsable>
         </div>
 
-        <div class="px-4">
-            <Collapsable Title=@Localizer["EditElementForm.Fields.Collapsable.Description.Title"] @bind-Collapsed="_collapsedDescription">
-                <div class="rounded-lg w-4/4 px-2 2xl:px-4 pb-2">
-                    <MudText Typo="Typo.caption">@Localizer["EditElementForm.Fields.Collapsable.Goals.Field.Description.Text"]</MudText>
-                    <MudTextField @bind-Value="FormDataContainer.FormModel.Description"
-                                  For="@(() => FormModel.Description)"
-                                  Lines="3"
-                                  Variant="Variant.Outlined"
-                                  DebounceInterval="DebounceInterval"
-                                  Class="pb-4 mt-0"/>
-                </div>
-            </Collapsable>
-        </div>
+            <div class="px-4">
+                <Collapsable Title=@Localizer["EditElementForm.Fields.Collapsable.Description.Title"] @bind-Collapsed="_collapsedDescription">
+                    <div class="rounded-lg w-4/4 px-2 2xl:px-4 pb-2">
+                        <MudText Typo="Typo.caption">@Localizer["EditElementForm.Fields.Collapsable.Goals.Field.Description.Text"]</MudText>
+                        <MudTextField @bind-Value="FormDataContainer.FormModel.Description"
+                                      For="@(() => FormModel.Description)"
+                                      Lines="3"
+                                      Variant="Variant.Outlined"
+                                      DebounceInterval="DebounceInterval"
+                                      Class="pb-4 mt-0"/>
+                    </div>
+                </Collapsable>
+            </div>
+        }
 
     </Fields>
     <FooterButtons>

diff --git a/Presentation/Resources/Components/Forms/Element/CreateElementForm.de.resx b/Presentation/Resources/Components/Forms/Element/CreateElementForm.de.resx
@@ -75,10 +75,10 @@
         <value>Lernziele</value>
     </data>
     <data name="CreateElementForm.Fields.Collapsable.Goals.Field.Description.Text" xml:space="preserve">
-        <value>Formulieren Sie hier eine Beschreibung für Ihr Lernelement.</value>
+        <value>Formulieren Sie hier eine Beschreibung.</value>
     </data>
     <data name="CreateElementForm.Fields.Collapsable.Goals.Field.Goals.Text" xml:space="preserve">
-        <value>Formulieren Sie hier Ihr(e) Lernziel(e) für dieses Lernelement.</value>
+        <value>Formulieren Sie hier Ihr(e) Lernziel(e).</value>
     </data>
     <data name="CreateElementForm.Fields.Collapsable.General.Field.Difficulty.Text" xml:space="preserve">
         <value>Schwierigkeitsgrad</value>

diff --git a/Presentation/Resources/Components/Forms/Element/CreateElementForm.en.resx b/Presentation/Resources/Components/Forms/Element/CreateElementForm.en.resx
@@ -66,10 +66,10 @@
         <value>Learning outcomes</value>
     </data>
     <data name="CreateElementForm.Fields.Collapsable.Goals.Field.Description.Text" xml:space="preserve">
-        <value>Formulate a description for your learning element.</value>
+        <value>Formulate a description.</value>
     </data>
     <data name="CreateElementForm.Fields.Collapsable.Goals.Field.Goals.Text" xml:space="preserve">
-        <value>Formulate your learning outcome(s) for this learning element.</value>
+        <value>Formulate your learning outcome(s).</value>
     </data>
     <data name="CreateElementForm.Fields.Collapsable.General.Field.Points.Text" xml:space="preserve">
         <value>Points</value>

diff --git a/Presentation/Resources/Components/Forms/Element/EditElementForm.de.resx b/Presentation/Resources/Components/Forms/Element/EditElementForm.de.resx
@@ -75,10 +75,10 @@
         <value>Lernziele</value>
     </data>
     <data name="EditElementForm.Fields.Collapsable.Goals.Field.Description.Text" xml:space="preserve">
-        <value>Formulieren Sie hier eine Beschreibung für Ihr Lernelement.</value>
+        <value>Formulieren Sie hier eine Beschreibung.</value>
     </data>
     <data name="EditElementForm.Fields.Collapsable.Goals.Field.Goals.Text" xml:space="preserve">
-        <value>Formulieren Sie hier Ihr(e) Lernziel(e) für dieses Lernelement.</value>
+        <value>Formulieren Sie hier Ihr(e) Lernziel(e).</value>
     </data>
     <data name="EditElementForm.Fields.Collapsable.LearningContent.Field.LearningContent.Text" xml:space="preserve">
         <value>Externes Lernmaterial</value>

diff --git a/Presentation/Resources/Components/Forms/Element/EditElementForm.en.resx b/Presentation/Resources/Components/Forms/Element/EditElementForm.en.resx
@@ -66,10 +66,10 @@
         <value>Learning outcomes</value>
     </data>
     <data name="EditElementForm.Fields.Collapsable.Goals.Field.Description.Text" xml:space="preserve">
-        <value>Formulate a description for your learning element.</value>
+        <value>Formulate a description.</value>
     </data>
     <data name="EditElementForm.Fields.Collapsable.Goals.Field.Goals.Text" xml:space="preserve">
-        <value>Formulate your learning outcome(s) for this learning element.</value>
+        <value>Formulate your learning outcome(s).</value>
     </data>
     <data name="EditElementForm.Fields.Collapsable.LearningContent.Field.LearningContent.Text" xml:space="preserve">
         <value>External learning material</value>

diff --git a/Presentation/View/MasterLayout.razor b/Presentation/View/MasterLayout.razor
@@ -55,6 +55,18 @@
                                 <SpaceFormContainer/>
                             </MainContent>
                         </SidebarItem>
+                        <SidebarItem
+                            IsActive="Mediator.StoryElementDialogOpen"
+                            RequestIsActiveToggle="Mediator.RequestToggleStoryElementDialog">
+                            <SidebarContent>
+                                <div class="w-10 p-1 my-1.5" title="@Localizer["SideBarContent.StoryLearningElementMetadata.Title"]">
+                                    <img class="w-full" src="CustomIcons/LeftSidebar/storyelement-icon_adlerdarkblue.png" alt="@Localizer["SideBarContent.StoryLearningElementMetadata.Alt"]">
+                                </div>
+                            </SidebarContent>
+                            <MainContent>
+                                <ElementFormContainer ElementMode="ElementMode.Story"/>
+                            </MainContent>
+                        </SidebarItem>
                         <SidebarItem
                             IsActive="Mediator.ElementDialogOpen"
                             RequestIsActiveToggle="Mediator.RequestToggleElementDialog">
@@ -79,18 +91,6 @@
                                 <ElementFormContainer ElementMode="ElementMode.Adaptivity"/>
                             </MainContent>
                         </SidebarItem>
-                        <SidebarItem
-                            IsActive="Mediator.StoryElementDialogOpen"
-                            RequestIsActiveToggle="Mediator.RequestToggleStoryElementDialog">
-                            <SidebarContent>
-                                <div class="w-10 p-1 my-1.5" title="@Localizer["SideBarContent.StoryLearningElementMetadata.Title"]">
-                                    <img class="w-full" src="CustomIcons/LeftSidebar/storyelement-icon_adlerdarkblue.png" alt="@Localizer["SideBarContent.StoryLearningElementMetadata.Alt"]">
-                                </div>
-                            </SidebarContent>
-                            <MainContent>
-                                <ElementFormContainer ElementMode="ElementMode.Story"/>
-                            </MainContent>
-                        </SidebarItem>
                         <SidebarItem
                             IsActive="Mediator.ContentDialogOpen"
                             RequestIsActiveToggle="Mediator.RequestToggleContentDialog">