yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2

Browse Source
This commit is contained in:
Shannon
2014-01-16 12:31:54 +11:00
parent 1e2e26d898 f56cb2c3ac
commit 076d90ddc4
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Empty.cshtml
View File

@@ -1 +1 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@inherits Umbraco.Web.Mvc.UmbracoTemplatePage

2
src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
View File

@@ -8,7 +8,7 @@
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="FileName" runat="server">*</asp:RequiredFieldValidator>
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server" Text="Choose a template:">
<cc1:PropertyPanel runat="server" Text="Choose a snippet:">
<asp:ListBox ID="PartialViewTemplate" runat="server" Width="350" CssClass="bigInput input-large-type input-block-level" Rows="1" SelectionMode="Single">
<asp:ListItem Value="clean.xslt">Clean</asp:ListItem>
</asp:ListBox>

10
src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.cs
View File

@@ -24,16 +24,16 @@ namespace Umbraco.Web.UI.Umbraco.Create
var path = IOHelper.MapPath(SystemDirectories.Umbraco + "/PartialViews/Templates/");
list.Items.Clear();
// always add the options of empty templates
list.Items.Add(new ListItem("Empty Template", "EmptyTemplate.cshtml"));
list.Items.Add(new ListItem("Empty Template (For Use With Custom Views)", "EmptyTemplate (ForUseWithCustomViews).cshtml"));
// always add the options of empty snippets
list.Items.Add(new ListItem("Empty", "Empty.cshtml"));
list.Items.Add(new ListItem("Empty (For Use With Custom Views)", "Empty (ForUseWithCustomViews).cshtml"));
if (System.IO.Directory.Exists(path))
{
const string extension = ".cshtml";
//Already adding Empty Template as the first item, so don't add it again
foreach (var fileInfo in new System.IO.DirectoryInfo(path).GetFiles("*" + extension).Where(f => f.Name.StartsWith("EmptyTemplate") == false))
//Already adding Empty as the first item, so don't add it again
foreach (var fileInfo in new System.IO.DirectoryInfo(path).GetFiles("*" + extension).Where(f => f.Name.StartsWith("Empty") == false))
{
var filename = System.IO.Path.GetFileName(fileInfo.FullName);

2
src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx
View File

@@ -9,7 +9,7 @@
<asp:RequiredFieldValidator ID="RequiredFieldValidator2" ErrorMessage="*" ControlToValidate="FileName" runat="server">*</asp:RequiredFieldValidator>
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server" Text="Choose a template:">
<cc1:PropertyPanel runat="server" Text="Choose a snippet:">
<asp:ListBox ID="PartialViewTemplate" runat="server" CssClass="bigInput input-large-type input-block-level" Rows="1" SelectionMode="Single" />
</cc1:PropertyPanel>

10
src/Umbraco.Web.UI/umbraco/create/PartialViewMacro.ascx.cs
View File

@@ -24,16 +24,16 @@ namespace Umbraco.Web.UI.Umbraco.Create
var path = IOHelper.MapPath(SystemDirectories.Umbraco + "/PartialViewMacros/Templates/");
list.Items.Clear();
// always add the options of empty templates
list.Items.Add(new ListItem("Empty Template", "EmptyTemplate.cshtml"));
list.Items.Add(new ListItem("Empty Template (For Use With Custom Views)", "EmptyTemplate (ForUseWithCustomViews).cshtml"));
// always add the options of empty snippets
list.Items.Add(new ListItem("Empty", "Empty.cshtml"));
list.Items.Add(new ListItem("Empty (For Use With Custom Views)", "Empty (ForUseWithCustomViews).cshtml"));
if (System.IO.Directory.Exists(path))
{
const string extension = ".cshtml";
//Already adding Empty Template as the first item, so don't add it again
foreach (var fileInfo in new System.IO.DirectoryInfo(path).GetFiles("*" + extension).Where(f => f.Name.StartsWith("EmptyTemplate") == false))
//Already adding Empty as the first item, so don't add it again
foreach (var fileInfo in new System.IO.DirectoryInfo(path).GetFiles("*" + extension).Where(f => f.Name.StartsWith("Empty") == false))
{
var filename = System.IO.Path.GetFileName(fileInfo.FullName);