Changed MasterPage->Template

MacdonaldRobinson · Dec 7, 2016 · 83f97c4 · 83f97c4
1 parent c3cc29d
commit 83f97c4
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 18 deletions.
diff --git a/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.dll b/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.dll
diff --git a/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.pdb b/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.pdb
diff --git a/WebApplication/Admin/Views/MasterPages/Admin.Master b/WebApplication/Admin/Views/MasterPages/Admin.Master
@@ -49,7 +49,7 @@
                                     <li><a href="/Admin/Views/PageHandlers/Permissions/Default.aspx">Manage Permissions</a></li>
                                     <li><a href="/Admin/Views/PageHandlers/Languages/Default.aspx">Manage Languages</a></li>
                                     <li><a href="/Admin/Views/PageHandlers/MediaTypes/Default.aspx">Manage MediaTypes</a></li>
-                                    <li><a href="/Admin/Views/PageHandlers/MasterPages/Default.aspx">Manage MasterPages</a></li>
+                                    <li><a href="/Admin/Views/PageHandlers/MasterPages/Default.aspx">Manage Templates</a></li>
                                     <li><a href="/Admin/Views/PageHandlers/AdminTools/Default.aspx">Admin Tools</a></li>
                                 </ul>
                             </li>

diff --git a/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx b/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx
@@ -3,8 +3,7 @@
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
-    <h1>
-        <asp:Literal ID="Section" runat="server"></asp:Literal></h1>
+    <h1>Manage Templates</h1>
     <asp:UpdatePanel runat="server" UpdateMode="Conditional" ID="UpdatePanel">
         <ContentTemplate>
             <a href="javascript:void(0);" onclick="executeAction('Create','', '<%= UpdatePanel.ClientID %>');">Create New</a>

diff --git a/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx.cs b/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx.cs
@@ -22,8 +22,6 @@ private List<MasterPage> Items
 
         protected void Page_Init(object sender, EventArgs e)
         {
-            this.Section.Text = this.Page.Title = "Manage MasterPages";
-
             if (Items == null)
                 Items = BaseMapper.GetDataModel().MasterPages.OrderBy(i => i.Name).ToList();
 

diff --git a/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx.designer.cs b/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx.designer.cs
diff --git a/WebApplication/Admin/Views/PageHandlers/MasterPages/Detail.aspx.cs b/WebApplication/Admin/Views/PageHandlers/MasterPages/Detail.aspx.cs
@@ -26,9 +26,9 @@ protected void Page_Load(object sender, EventArgs e)
         private string GetSectionTitle()
         {
             if (selectedItem == null)
-                return "New MasterPage";
+                return "New Template";
             else
-                return "Editing MasterPage: " + selectedItem.Name;
+                return "Editing Template: " + selectedItem.Name;
         }
 
         private void UpdateObjectFromFields()

diff --git a/WebApplication/Admin/Views/PageHandlers/MediaTypes/Default.aspx b/WebApplication/Admin/Views/PageHandlers/MediaTypes/Default.aspx
@@ -15,7 +15,7 @@
                     <asp:BoundField DataField="Name" HeaderText="Name" SortExpression="Name" />
                     <asp:BoundField DataField="Label" HeaderText="Label" SortExpression="Label" />
                     <asp:BoundField DataField="MediaTypeHandler" HeaderText="MediaTypeHandler" SortExpression="MediaTypeHandler" />
-                    <asp:BoundField DataField="MasterPage.Name" HeaderText="MasterPage" SortExpression="MasterPage" />
+                    <asp:BoundField DataField="MasterPage.Name" HeaderText="Template" SortExpression="Template" />
                     <asp:BoundField DataField="UseMediaTypeLayouts" HeaderText="UseMediaTypeLayouts" SortExpression="UseMediaTypeLayouts" />
                     <asp:BoundField DataField="IsActive" HeaderText="IsActive" SortExpression="IsActive" />
                     <asp:BoundField DataField="EnableCaching" HeaderText="EnableCaching" SortExpression="EnableCaching" />

diff --git a/WebApplication/Admin/Views/PageHandlers/Settings/Default.aspx b/WebApplication/Admin/Views/PageHandlers/Settings/Default.aspx
@@ -22,7 +22,7 @@
 
                 <div>
                     <label for="<%= DefaultMasterPageSelector.ClientID %>">
-                        Default Master Page:</label>
+                        Default Template:</label>
                     <div>
                         <asp:DropDownList runat="server" ID="DefaultMasterPageSelector">
                         </asp:DropDownList>

diff --git a/WebApplication/bin/FrameworkLibrary.dll b/WebApplication/bin/FrameworkLibrary.dll
diff --git a/WebApplication/bin/FrameworkLibrary.pdb b/WebApplication/bin/FrameworkLibrary.pdb
diff --git a/WebApplication/bin/TinyFileManager.dll b/WebApplication/bin/TinyFileManager.dll
diff --git a/WebApplication/bin/TinyFileManager.pdb b/WebApplication/bin/TinyFileManager.pdb
diff --git a/WebApplication/bin/WebApplication.dll b/WebApplication/bin/WebApplication.dll
diff --git a/WebApplication/bin/WebApplication.pdb b/WebApplication/bin/WebApplication.pdb