diff --git a/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.dll b/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.dll index aa18ded0..6fe6dd8f 100644 Binary files a/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.dll and b/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.dll differ diff --git a/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.pdb b/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.pdb index de9f06c6..b9424a4b 100644 Binary files a/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.pdb and b/TinyFileManager.NET-master/TinyFileManager.NET/bin/TinyFileManager.pdb differ diff --git a/WebApplication/Admin/Views/MasterPages/Admin.Master b/WebApplication/Admin/Views/MasterPages/Admin.Master index 124ac105..4f68141b 100644 --- a/WebApplication/Admin/Views/MasterPages/Admin.Master +++ b/WebApplication/Admin/Views/MasterPages/Admin.Master @@ -49,7 +49,7 @@
  • Manage Permissions
  • Manage Languages
  • Manage MediaTypes
    • -
  • Manage MasterPages
    • +
  • Manage Templates
  • Admin Tools
    • diff --git a/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx b/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx index be674232..d34e802a 100644 --- a/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx +++ b/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx @@ -3,8 +3,7 @@ -

    -

    +

    Manage Templates

    Create New diff --git a/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx.cs b/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx.cs index d35231b5..e424c3d4 100644 --- a/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx.cs +++ b/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx.cs @@ -22,8 +22,6 @@ private List 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 index a907f709..393059b3 100644 --- a/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx.designer.cs +++ b/WebApplication/Admin/Views/PageHandlers/MasterPages/Default.aspx.designer.cs @@ -12,15 +12,6 @@ namespace WebApplication.Admin.Views.PageHandlers.MasterPages { public partial class Default { - /// - /// Section control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal Section; - /// /// UpdatePanel control. /// diff --git a/WebApplication/Admin/Views/PageHandlers/MasterPages/Detail.aspx.cs b/WebApplication/Admin/Views/PageHandlers/MasterPages/Detail.aspx.cs index 6bfae6c6..82b1c46e 100644 --- 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 index 2fc3ca6c..a4ef26a9 100644 --- a/WebApplication/Admin/Views/PageHandlers/MediaTypes/Default.aspx +++ b/WebApplication/Admin/Views/PageHandlers/MediaTypes/Default.aspx @@ -15,7 +15,7 @@ - + diff --git a/WebApplication/Admin/Views/PageHandlers/Settings/Default.aspx b/WebApplication/Admin/Views/PageHandlers/Settings/Default.aspx index 9b3ebd89..7f184b9d 100644 --- a/WebApplication/Admin/Views/PageHandlers/Settings/Default.aspx +++ b/WebApplication/Admin/Views/PageHandlers/Settings/Default.aspx @@ -22,7 +22,7 @@
    + Default Template:
    diff --git a/WebApplication/bin/FrameworkLibrary.dll b/WebApplication/bin/FrameworkLibrary.dll index dd8bcab7..fcf96418 100644 Binary files a/WebApplication/bin/FrameworkLibrary.dll and b/WebApplication/bin/FrameworkLibrary.dll differ diff --git a/WebApplication/bin/FrameworkLibrary.pdb b/WebApplication/bin/FrameworkLibrary.pdb index 6f29870b..aebb9e49 100644 Binary files a/WebApplication/bin/FrameworkLibrary.pdb and b/WebApplication/bin/FrameworkLibrary.pdb differ diff --git a/WebApplication/bin/TinyFileManager.dll b/WebApplication/bin/TinyFileManager.dll index aa18ded0..6fe6dd8f 100644 Binary files a/WebApplication/bin/TinyFileManager.dll and b/WebApplication/bin/TinyFileManager.dll differ diff --git a/WebApplication/bin/TinyFileManager.pdb b/WebApplication/bin/TinyFileManager.pdb index de9f06c6..b9424a4b 100644 Binary files a/WebApplication/bin/TinyFileManager.pdb and b/WebApplication/bin/TinyFileManager.pdb differ diff --git a/WebApplication/bin/WebApplication.dll b/WebApplication/bin/WebApplication.dll index ad2b5752..8f7d1b90 100644 Binary files a/WebApplication/bin/WebApplication.dll and b/WebApplication/bin/WebApplication.dll differ diff --git a/WebApplication/bin/WebApplication.pdb b/WebApplication/bin/WebApplication.pdb index d5383678..b2d82df8 100644 Binary files a/WebApplication/bin/WebApplication.pdb and b/WebApplication/bin/WebApplication.pdb differ