diff --git a/TajikGanjoor/Pages/Index.cshtml b/TajikGanjoor/Pages/Index.cshtml index 6ed7f683..9669195f 100644 --- a/TajikGanjoor/Pages/Index.cshtml +++ b/TajikGanjoor/Pages/Index.cshtml @@ -34,20 +34,18 @@ var poem = Model.Poems[poemIndex];
- - -

- @poem.FullTitle -

-
 
-
- @Html.Raw(poem.PlainText) + + @poem.Category.Poet.Nickname + +
+

+ @poem.FullTitle +

+
+ @Html.Raw(poem.PlainText) +
- - - -
 
-
} @@ -59,14 +57,61 @@ else @if (Model.IsHomePage) { - @foreach (var poet in Model.Poets) - { -

@poet.Nickname

- } +
+ @foreach (var poet in Model.Poets) + { + + + @poet.Nickname + + @poet.Nickname + + } +
} else { - @Html.Raw(Model.GanjoorPage.HtmlText) + @if (Model.IsPoetPage) + { +
+ + @Model.GanjoorPage.PoetOrCat.Poet.Nickname + +
+
+ @Html.Raw(Model.GanjoorPage.HtmlText) +
+ } + else if (Model.IsCatPage) + { + + + @Model.GanjoorPage.PoetOrCat.Poet.Nickname + + @Model.GanjoorPage.PoetOrCat.Poet.Nickname + +
+ @Html.Raw(Model.GanjoorPage.HtmlText) +
+ } + else if (Model.IsPoemPage) + { + + + @Model.GanjoorPage.Poem.Category.Poet.Nickname + + @Model.GanjoorPage.Poem.Category.Poet.Nickname + + @Html.Raw(Model.GanjoorPage.HtmlText) + } + else + { + @Html.Raw(Model.GanjoorPage.HtmlText) + } }
diff --git a/TajikGanjoor/Pages/Shared/_Layout.cshtml b/TajikGanjoor/Pages/Shared/_Layout.cshtml index 7f1beee8..38b8fbf3 100644 --- a/TajikGanjoor/Pages/Shared/_Layout.cshtml +++ b/TajikGanjoor/Pages/Shared/_Layout.cshtml @@ -6,12 +6,13 @@ @ViewData["Title"] +