Skip to content

Commit 83f97c4

Browse files
author
mac
committed
Changed MasterPage->Template
1 parent c3cc29d commit 83f97c4

15 files changed

Lines changed: 6 additions & 18 deletions

File tree

Binary file not shown.
Binary file not shown.

WebApplication/Admin/Views/MasterPages/Admin.Master

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<li><a href="/Admin/Views/PageHandlers/Permissions/Default.aspx">Manage Permissions</a></li>
5050
<li><a href="/Admin/Views/PageHandlers/Languages/Default.aspx">Manage Languages</a></li>
5151
<li><a href="/Admin/Views/PageHandlers/MediaTypes/Default.aspx">Manage MediaTypes</a></li>
52-
<li><a href="/Admin/Views/PageHandlers/MasterPages/Default.aspx">Manage MasterPages</a></li>
52+
<li><a href="/Admin/Views/PageHandlers/MasterPages/Default.aspx">Manage Templates</a></li>
5353
<li><a href="/Admin/Views/PageHandlers/AdminTools/Default.aspx">Admin Tools</a></li>
5454
</ul>
5555
</li>

WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
44
</asp:Content>
55
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
6-
<h1>
7-
<asp:Literal ID="Section" runat="server"></asp:Literal></h1>
6+
<h1>Manage Templates</h1>
87
<asp:UpdatePanel runat="server" UpdateMode="Conditional" ID="UpdatePanel">
98
<ContentTemplate>
109
<a href="javascript:void(0);" onclick="executeAction('Create','', '<%= UpdatePanel.ClientID %>');">Create New</a>

WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ private List<MasterPage> Items
2222

2323
protected void Page_Init(object sender, EventArgs e)
2424
{
25-
this.Section.Text = this.Page.Title = "Manage MasterPages";
26-
2725
if (Items == null)
2826
Items = BaseMapper.GetDataModel().MasterPages.OrderBy(i => i.Name).ToList();
2927

WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx.designer.cs

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WebApplication/Admin/Views/PageHandlers/MasterPages/Detail.aspx.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ protected void Page_Load(object sender, EventArgs e)
2626
private string GetSectionTitle()
2727
{
2828
if (selectedItem == null)
29-
return "New MasterPage";
29+
return "New Template";
3030
else
31-
return "Editing MasterPage: " + selectedItem.Name;
31+
return "Editing Template: " + selectedItem.Name;
3232
}
3333

3434
private void UpdateObjectFromFields()

WebApplication/Admin/Views/PageHandlers/MediaTypes/Default.aspx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<asp:BoundField DataField="Name" HeaderText="Name" SortExpression="Name" />
1616
<asp:BoundField DataField="Label" HeaderText="Label" SortExpression="Label" />
1717
<asp:BoundField DataField="MediaTypeHandler" HeaderText="MediaTypeHandler" SortExpression="MediaTypeHandler" />
18-
<asp:BoundField DataField="MasterPage.Name" HeaderText="MasterPage" SortExpression="MasterPage" />
18+
<asp:BoundField DataField="MasterPage.Name" HeaderText="Template" SortExpression="Template" />
1919
<asp:BoundField DataField="UseMediaTypeLayouts" HeaderText="UseMediaTypeLayouts" SortExpression="UseMediaTypeLayouts" />
2020
<asp:BoundField DataField="IsActive" HeaderText="IsActive" SortExpression="IsActive" />
2121
<asp:BoundField DataField="EnableCaching" HeaderText="EnableCaching" SortExpression="EnableCaching" />

WebApplication/Admin/Views/PageHandlers/Settings/Default.aspx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<div>
2424
<label for="<%= DefaultMasterPageSelector.ClientID %>">
25-
Default Master Page:</label>
25+
Default Template:</label>
2626
<div>
2727
<asp:DropDownList runat="server" ID="DefaultMasterPageSelector">
2828
</asp:DropDownList>
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)