Skip to content

Commit

Permalink
Move Title to Navbar header (#4476)
Browse files Browse the repository at this point in the history
* Move Title to Navbar header

Fix #3688
  • Loading branch information
agriffard committed Oct 11, 2019
1 parent f0bc883 commit 13ba0cf
Show file tree
Hide file tree
Showing 93 changed files with 402 additions and 387 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model AdminMenuCreateViewModel

<h1>@RenderTitleSegments(T["Create Admin Menu {0}", Model.Name])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Create Admin Menu {0}", Model.Name])</h1></zone>

<div asp-validation-summary="ModelOnly"></div>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@model AdminMenuEditViewModel
<style asp-src="~/OrchardCore.AdminMenu/Styles/admin-menu.min.css" debug-src="~/OrchardCore.AdminMenu/Styles/admin-menu.css" at="Head" depends-on="admin"></style>

<h1>@RenderTitleSegments(T["Edit Admin Menu: {0}", Model.Name])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Admin Menu: {0}", Model.Name])</h1></zone>

<div asp-validation-summary="ModelOnly"></div>
<form asp-action="Edit" method="post">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<div class="row">
<div class="form-group col mb-n1">
<h1>@RenderTitleSegments(T["Admin Menus"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Admin Menus"])</h1></zone>
</div>
<div class="form-group col mb-n1">
<div class="dropdown float-right order-md-1">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model AdminNodeEditViewModel

<h1>@RenderTitleSegments(T["Create Node"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Create Node"])</h1></zone>

<div asp-validation-summary="All"></div>
<form asp-action="Create" method="post">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model AdminNodeEditViewModel

<h1>@RenderTitleSegments(T["Edit Node"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Node"])</h1></zone>

<div asp-validation-summary="All"></div>
<form asp-action="Edit" method="post">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<script asp-src="~/OrchardCore.AdminMenu/Scripts/admin-menu.min.js" at="Foot" depends-on="admin"></script>
<style asp-src="~/OrchardCore.AdminMenu/Styles/admin-menu.min.css" debug-src="~/OrchardCore.AdminMenu/Styles/admin-menu.css"></style>

<h1>@RenderTitleSegments(T["Edit Nodes for '{0}'", Model.AdminMenu.Name])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Nodes for '{0}'", Model.AdminMenu.Name])</h1></zone>

<nav class="admin-toolbar">
<ul class="navbar-nav mr-auto">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model BackgroundTaskViewModel

<h1>@RenderTitleSegments(T["Edit Task Settings"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Task Settings"])</h1></zone>

<div asp-validation-summary="ModelOnly"></div>
<form asp-action="Create" method="post">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model BackgroundTaskViewModel

<h1>@RenderTitleSegments(T["Edit Task Settings"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Task Settings"])</h1></zone>

<div asp-validation-summary="ModelOnly"></div>
<form asp-action="Edit" method="post">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@model BackgroundTaskIndexViewModel
@inject OrchardCore.Modules.ILocalClock LocalClock

<h1>@RenderTitleSegments(T["Background Tasks"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Background Tasks"])</h1></zone>

<form asp-action="Index"> @* the form is necessary to generate an antiforgery token for the delete action *@

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}


<h1>@RenderTitleSegments(T["Add New Field To \"{0}\"", Model.Part.DisplayName()])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Add New Field To \"{0}\"", Model.Part.DisplayName()])</h1></zone>

<form asp-action="AddFieldTo" asp-route-returnUrl="@ViewData["returnUrl"]">
@Html.ValidationSummary()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@{
int i = 0;
}
<h1>@T["Add Parts To \"{0}\"", Model.Type.DisplayName]</h1>
<zone name="Title"><h1>@T["Add Parts To \"{0}\"", Model.Type.DisplayName]</h1></zone>

@T["Choose the Parts to add to this Content Type."]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@{
int i = 0;
}
<h1>@T["Add Named Part To \"{0}\"", Model.Type.DisplayName]</h1>
<zone name="Title"><h1>@T["Add Named Part To \"{0}\"", Model.Type.DisplayName]</h1></zone>

<form asp-action="AddReusablePartTo">
@Html.ValidationSummary()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model CreateTypeViewModel

<h1>@RenderTitleSegments(T["New Content Type"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["New Content Type"])</h1></zone>

<form asp-action="Create">
@Html.ValidationSummary()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model CreatePartViewModel

<h1>@RenderTitleSegments(T["New Content Part"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["New Content Part"])</h1></zone>

<form asp-action="CreatePart">
@Html.ValidationSummary()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.Select(x => x.Field);
}

<h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Content Type - {0}", Model.TypeDefinition.DisplayName])</h1></zone>

<form asp-action="Edit">
@Html.ValidationSummary()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
var returnUrl = ViewData["returnUrl"]?.ToString();
}

<h1>@RenderTitleSegments(T["\"{0}\" settings for \"{1}\"", Model.DisplayName, Model.PartFieldDefinition.PartDefinition.DisplayName()])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["\"{0}\" settings for \"{1}\"", Model.DisplayName, Model.PartFieldDefinition.PartDefinition.DisplayName()])</h1></zone>

<form asp-action="EditField" asp-route-returnUrl="@ViewData["returnUrl"]">
@Html.ValidationSummary()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
.OrderBy(x => x.Order)
.Select(x => x.Field);
}
<h1>@RenderTitleSegments(T["Edit Content Part - {0}", Model.DisplayName])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Content Part - {0}", Model.DisplayName])</h1></zone>

<form asp-action="EditPart">
@Html.ValidationSummary()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
var editorShapes = shapeTable.ShapeBindings.Keys.Where(x => x.StartsWith(Model.TypePartDefinition.PartDefinition.Name + "_Option__", StringComparison.OrdinalIgnoreCase) || x.EndsWith(Model.TypePartDefinition.PartDefinition.Name + "_Option", StringComparison.OrdinalIgnoreCase));
}

<h1>@RenderTitleSegments(T["Edit Part - {0}", Model.DisplayName])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Part - {0}", Model.DisplayName])</h1></zone>

<div class="alert alert-success" role="alert">
@T["Some part settings common to all types can also be defined at the <a href=\"{0}\">Part Definition</a> level.", Url.Action("EditPart", new { id = typePart.PartDefinition.Name })]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="row">
<div class="form-group col mb-n1">
<h1>@RenderTitleSegments(T["Content Types"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Content Types"])</h1></zone>
</div>
<div class="form-group col mb-n1">
<a asp-route-action="Create" id="btnCreate" class="btn btn-primary float-right" role="button">@T["Create new type"]</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="row">
<div class="form-group col mb-n1">
<h1>@RenderTitleSegments(T["Content Parts"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Content Parts"])</h1></zone>
</div>
<div class="form-group col mb-n1">
<a asp-route-action="CreatePart" id="btnCreate" class="btn btn-primary float-right" role="button">@T["Create new part"]</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
var typeDisplayName = contentTypeDefinition?.DisplayName ?? contentItem.ContentType.CamelFriendly();
}

<h1>@RenderTitleSegments(T["New {0}", Html.Raw(typeDisplayName)])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["New {0}", Html.Raw(typeDisplayName)])</h1></zone>
<form asp-action="Create" asp-route-returnUrl="@Context.Request.Query["ReturnUrl"]" method="post" enctype="multipart/form-data">
@Html.ValidationSummary()
@await DisplayAsync(Model)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
var typeDisplayName = contentTypeDefinition?.DisplayName ?? contentItem.ContentType.CamelFriendly();
}

<h1>@RenderTitleSegments(T["Edit {0}", Html.Raw(typeDisplayName)])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit {0}", Html.Raw(typeDisplayName)])</h1></zone>

<form asp-action="Edit" asp-route-contentitemid="@contentItem.ContentItemId" asp-route-returnUrl="@Context.Request.Query["ReturnUrl"]" method="post" enctype="multipart/form-data">
@Html.ValidationSummary()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@*TODO: Replace by display name*@
<h1>@RenderTitleSegments(T["Edit {0}", (string)Model.ContentItem.ContentType])</h1>
@*TODO: Replace by display name*@
<zone name="Title"><h1>@RenderTitleSegments(T["Edit {0}", (string)Model.ContentItem.ContentType])</h1></zone>

<form asp-action="Edit" method="post">
@Html.ValidationSummary()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model EditRemoteClientViewModel

<h1>@RenderTitleSegments(T["Edit Remote Client"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Remote Client"])</h1></zone>

<div asp-validation-summary="ModelOnly"></div>
<form asp-action="Edit" method="post">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model RemoteClientIndexViewModel

<h1>@RenderTitleSegments(T["Remote Clients"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Remote Clients"])</h1></zone>

<div class="alert alert-info" role="alert">
@T["Url to use from client instances: <b>{0}</b>", Url.Action("Import", "ImportRemoteInstance", null, Context.Request.Scheme)]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model EditRemoteInstanceViewModel

<h1>@RenderTitleSegments(T["Create Remote Instance"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Create Remote Instance"])</h1></zone>

<div asp-validation-summary="ModelOnly"></div>
<form asp-action="Create" method="post">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model EditRemoteInstanceViewModel

<h1>@RenderTitleSegments(T["Edit Remote Instance"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Remote Instance"])</h1></zone>

<div asp-validation-summary="ModelOnly"></div>
<form asp-action="Edit" method="post">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model RemoteInstanceIndexViewModel
@model RemoteInstanceIndexViewModel

<h1>@RenderTitleSegments(T["Remote Instances"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Remote Instances"])</h1></zone>

<nav class="admin-toolbar">
<ul class="navbar-nav">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model CreateDeploymentPlanViewModel

<h1>@RenderTitleSegments(T["Create Deployment Plan"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Create Deployment Plan"])</h1></zone>

<div asp-validation-summary="ModelOnly"></div>
<form asp-action="Create" method="post">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@using OrchardCore.Deployment.Services
@using Microsoft.AspNetCore.Routing

<h1>@RenderTitleSegments(T["Deployment Plan"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Deployment Plan"])</h1></zone>

<nav class="admin-toolbar">
<ul class="navbar-nav mr-auto">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model EditDeploymentPlanViewModel

<h1>@RenderTitleSegments(T["Edit Deployment Plan"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Deployment Plan"])</h1></zone>

<div asp-validation-summary="ModelOnly"></div>
<form asp-action="Edit" method="post">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model DeploymentPlanIndexViewModel

<h1>@RenderTitleSegments(T["Deployment Plans"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Deployment Plans"])</h1></zone>

<nav class="admin-toolbar">
<ul class="navbar-nav mr-auto">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h1>@RenderTitleSegments(T["Import Deployment Package"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Import Deployment Package"])</h1></zone>

<form asp-action="Import" enctype="multipart/form-data">
<nav class="admin-toolbar">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model EditDeploymentPlanStepViewModel
@model EditDeploymentPlanStepViewModel

<h1>@RenderTitleSegments(T["Create Step"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Create Step"])</h1></zone>

<div asp-validation-summary="ModelOnly"></div>
<form asp-action="Create" method="post">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model EditDeploymentPlanStepViewModel
@model EditDeploymentPlanStepViewModel

<h1>@RenderTitleSegments(T["Edit Step"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Step"])</h1></zone>

<div asp-validation-summary="ModelOnly"></div>
<form asp-action="Edit" method="post">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model OrchardCore.Email.ViewModels.SmtpSettingsViewModel

<h1>@RenderTitleSegments(T["Settings"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Settings"])</h1></zone>

<form asp-action="Index" asp-controller="Admin" asp-area="OrchardCore.Email" method="post">
@Html.ValidationSummary()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}
<div class="row">
<div class="form-group col mb-n1">
<h1>@RenderTitleSegments(T["Features"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Features"])</h1></zone>
</div>
<div class="form-group col mb-n1">
<div class="dropdown float-right order-md-1">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model OrchardCore.Layers.ViewModels.LayerEditViewModel

<h1>@RenderTitleSegments(T["Create Layer"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Create Layer"])</h1></zone>

<form asp-action="Create" method="post">
<fieldset class="form-group" asp-validation-class-for="Name">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model OrchardCore.Layers.ViewModels.LayerEditViewModel

<h1>@RenderTitleSegments(T["Edit Layer - {0}", Model.Name])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Layer - {0}", Model.Name])</h1></zone>

<form asp-action="Edit" method="post">
<fieldset class="form-group" asp-validation-class-for="Name">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
<script asp-name="jquery-ui" at="Foot"></script>

<h1>@RenderTitleSegments(T["Edit Widget Layers"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit Widget Layers"])</h1></zone>

<form id="undo-form" asp-action="UpdatePosition" method="post">
<div id="layer-undo-message" class="alert alert-success alert-dismissible show d-none" role="alert">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model AdminEditViewModel

<h1>@RenderTitleSegments(T["Create Index"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Create Index"])</h1></zone>

<div asp-validation-summary="ModelOnly"></div>
<form asp-action="Create" method="post">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@model AdminIndexViewModel

<h1>@RenderTitleSegments(T["Indexes"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Indexes"])</h1></zone>

<nav class="admin-toolbar">
<ul class="navbar-nav mr-auto"></ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<script asp-name="codemirror" depends-on="admin" at="Foot"></script>
<script asp-name="codemirror-mode-javascript" at="Foot"></script>

<h1>@RenderTitleSegments(T["Lucene Query"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Lucene Query"])</h1></zone>

<form asp-action="Query" method="post">

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@
});
</script>

<h1>@RenderTitleSegments(T["Assets"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Assets"])</h1></zone>

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@model OrchardCore.Media.ViewModels.MediaCacheViewModel
<h1>@RenderTitleSegments(T["Asset Cache"])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Asset Cache"])</h1></zone>

@if (Model.IsConfigured)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
var typeDisplayName = contentTypeDefinition?.DisplayName ?? contentItem.ContentType.CamelFriendly();
}

<h1>@RenderTitleSegments(T["New {0}", typeDisplayName])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["New {0}", typeDisplayName])</h1></zone>
<form asp-action="Create" asp-route-returnUrl="@Context.Request.Query["ReturnUrl"]" method="post" enctype="multipart/form-data">
@Html.ValidationSummary()
@await DisplayAsync(Model)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
var typeDisplayName = contentTypeDefinition?.DisplayName ?? contentItem.ContentType.CamelFriendly();
}

<h1>@RenderTitleSegments(T["Edit {0}", typeDisplayName])</h1>
<zone name="Title"><h1>@RenderTitleSegments(T["Edit {0}", typeDisplayName])</h1></zone>

<form asp-action="Edit" asp-route-returnUrl="@Context.Request.Query["ReturnUrl"]" method="post" enctype="multipart/form-data">
@Html.ValidationSummary()
Expand Down

0 comments on commit 13ba0cf

Please sign in to comment.