Skip to content

Commit 77c1551

Browse files
author
mac
committed
Updated DB Schema, Fixed some bugs
1 parent 83f97c4 commit 77c1551

26 files changed

Lines changed: 142 additions & 71 deletions

‎WebApplication/Admin/Controls/Editors/BaseFieldsEditor.cs‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,49 @@ public BaseFieldsEditor()
151151
FrontEndLayout = @"@{
152152
var fieldValues = StringHelper.JsonToObject<List<string>>(Model.Field.FieldValue);
153153
154+
if(fieldValues != null)
155+
{
156+
foreach(var item in fieldValues)
157+
{
158+
<li>@item</li>
159+
}
160+
}
161+
}",
162+
});
163+
164+
SelectorFieldOptions.Add(new SelectorFieldOption()
165+
{
166+
OptionText = "Drop Down List",
167+
OptionValue = "DropDownList",
168+
AdminControl = @"<asp:DropDownList runat='server'>
169+
<asp:ListItem Text='Item1' Value='Item1'></asp:ListItem>
170+
<asp:ListItem Text='Item2' Value='Item2'></asp:ListItem>
171+
<asp:ListItem Text='Item3' Value='Item3'></asp:ListItem>
172+
<asp:ListItem Text='Item4' Value='Item4'></asp:ListItem>
173+
<asp:ListItem Text='Item5' Value='Item5'></asp:ListItem>
174+
</asp:DropDownList>",
175+
GetAdminControlValue = @"@using System.Web.UI.WebControls
176+
@{
177+
var selectedItems = ((ListItemCollection)Model.Control.Items).Cast<ListItem>().Where(i => i.Selected);
178+
@Raw(StringHelper.ObjectToJson(selectedItems.Select(i => i.Value).ToList()));
179+
}",
180+
SetAdminControlValue = @"@{
181+
var newValues = StringHelper.JsonToObject<List<string>>(Model.NewValue);
182+
183+
if(newValues != null)
184+
{
185+
foreach(var controlItem in Model.Control.Items)
186+
{
187+
if(Enumerable.Contains(newValues, controlItem.Value))
188+
{
189+
controlItem.Selected=true;
190+
}
191+
}
192+
}
193+
}",
194+
FrontEndLayout = @"@{
195+
var fieldValues = StringHelper.JsonToObject<List<string>>(Model.Field.FieldValue);
196+
154197
if(fieldValues != null)
155198
{
156199
foreach(var item in fieldValues)

‎WebApplication/Admin/Controls/Editors/MediaFieldsEditor.ascx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<ContentTemplate>
8585
<fieldset>
8686
<legend>Currently Created Fields</legend>
87-
<asp:GridView runat="server" ID="ItemList" AutoGenerateColumns="false" AllowPaging="true" CssClass="DragDropGrid" OnPageIndexChanging="ItemList_PageIndexChanging" PageSize="20">
87+
<asp:GridView runat="server" ID="ItemList" AutoGenerateColumns="false" AllowPaging="false" CssClass="DragDropGrid" OnPageIndexChanging="ItemList_PageIndexChanging" PageSize="20">
8888
<Columns>
8989
<asp:BoundField DataField="ID" HeaderText="ID" SortExpression="ID" />
9090
<asp:BoundField DataField="OrderIndex" HeaderText="OrderIndex" SortExpression="OrderIndex" />

‎WebApplication/Admin/Controls/Editors/MediaTypeFieldsEditor.ascx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ContentTemplate>
1313
<fieldset>
1414
<legend>Currently Created Fields</legend>
15-
<asp:GridView runat="server" ID="ItemList" AutoGenerateColumns="false" AllowPaging="true" OnPageIndexChanging="ItemList_PageIndexChanging">
15+
<asp:GridView runat="server" ID="ItemList" AutoGenerateColumns="false" AllowPaging="false" OnPageIndexChanging="ItemList_PageIndexChanging">
1616
<Columns>
1717
<asp:BoundField DataField="ID" HeaderText="ID" SortExpression="ID" />
1818
<asp:BoundField DataField="FieldCode" HeaderText="FieldCode" SortExpression="FieldCode" />

‎WebApplication/Admin/Controls/Fields/MultiFileUploader.ascx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<a>
4040
<img src="<%# (Item.MediaDetail != null) ? URIHelper.ConvertToAbsUrl(Item.MediaDetail.PathToFile) : "#" %>" alt="<%# (Item.MediaDetail != null) ? Item.MediaDetail.SectionTitle : "" %>" />
4141
<div style="max-width:100px;">
42-
<%# (Item.MediaDetail != null) ? Item.MediaDetail.SectionTitle : ""; %>
42+
<%# (Item.MediaDetail != null) ? Item.MediaDetail.SectionTitle : "" %>
4343
</div>
4444
</a>
4545
</li>

‎WebApplication/Admin/Controls/MediaTypes/Common/Tabs/AdvancedSettingsTab.ascx.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void UpdateFieldsFromObject()
4545
Handler.SetValue(selectedItem.Handler);
4646
MediaTypeID.Text = selectedItem.MediaTypeID.ToString();
4747
MediaType.Text = MediaTypesMapper.GetByID(selectedItem.MediaTypeID).Name.ToString();
48-
EnableCaching.Checked = selectedItem.EnableCaching;
48+
EnableCaching.Checked = selectedItem.EnableCaching;
4949

5050
if (selectedItem.LastUpdatedByUserID != 0)
5151
LastModifiedByUser.Text = UsersMapper.GetByID(selectedItem.LastUpdatedByUserID).UserName;
@@ -62,7 +62,7 @@ public void UpdateFieldsFromObject()
6262
public void UpdateObjectFromFields()
6363
{
6464
selectedItem.Handler = Handler.GetValue().ToString();
65-
selectedItem.EnableCaching = EnableCaching.Checked;
65+
selectedItem.EnableCaching = EnableCaching.Checked;
6666

6767
if (MasterPageSelector.SelectedValue != "")
6868
selectedItem.MasterPageID = long.Parse(MasterPageSelector.SelectedValue);
@@ -98,6 +98,7 @@ protected void MediaTypeChange_Click(object sender, System.EventArgs e)
9898
newField.SetAdminControlValue = mediaTypeField.SetAdminControlValue;
9999
newField.FieldValue = mediaTypeField.FieldValue;
100100
newField.MediaTypeField = mediaTypeField;
101+
newField.UseMediaTypeFieldFrontEndLayout = true;
101102

102103
newField.DateCreated = DateTime.Now;
103104
newField.DateLastModified = DateTime.Now;
@@ -120,7 +121,8 @@ protected void MediaTypeChange_Click(object sender, System.EventArgs e)
120121
}
121122
else
122123
{
123-
Response.Redirect(Request.RawUrl);
124+
var url = AdminBasePage.GetRedirectToMediaDetailUrl(selectedItem.MediaTypeID, selectedItem.MediaID);
125+
Response.Redirect(url);
124126
}
125127
}
126128
}

‎WebApplication/Admin/Controls/MediaTypes/Common/Tabs/LayoutsTab.ascx.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ public void UpdateFieldsFromObject()
1919
{
2020
MainLayout.Text = selectedItem.MainLayout;
2121
SummaryLayout.Text = selectedItem.SummaryLayout;
22+
FeaturedLayout.Text = selectedItem.FeaturedLayout;
2223
UseMediaTypeLayouts.Checked = selectedItem.UseMediaTypeLayouts;
2324
}
2425

2526
public void UpdateObjectFromFields()
2627
{
2728
selectedItem.MainLayout = MainLayout.Text;
2829
selectedItem.SummaryLayout = SummaryLayout.Text;
30+
selectedItem.FeaturedLayout = FeaturedLayout.Text;
2931
selectedItem.UseMediaTypeLayouts = UseMediaTypeLayouts.Checked;
3032
}
3133
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ protected void Save_OnClick(object sender, EventArgs e)
106106
ContextHelper.ClearAllMemoryCache();
107107
FileCacheHelper.ClearAllCache();
108108

109-
SettingsMapper.SetSettings(settings);
109+
SettingsMapper.ClearCache();
110110

111111
DisplaySuccessMessage("Successfully saved settings");
112112
}

‎WebApplication/Controls/Generic/GenerateNav.ascx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
<li id="li" runat="server">
1010
<asp:HyperLink ID="Link" runat="server"></asp:HyperLink>
1111
<asp:ListView ID="ChildList" runat="server">
12+
<LayoutTemplate>
13+
<ul id="ul" runat="server">
14+
<li class="go-back" id="BackButton" runat="server" visible="false"><a href="#back">Back</a></li>
15+
<asp:PlaceHolder runat="server" ID="itemPlaceholder"></asp:PlaceHolder>
16+
</ul>
17+
</LayoutTemplate>
1218
<ItemTemplate>
1319
</ItemTemplate>
1420
</asp:ListView>

‎WebApplication/Controls/Generic/GenerateNav.ascx.cs‎

Lines changed: 41 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,21 @@ protected void ItemsList_OnLayoutCreated(object sender, EventArgs e)
9393
{
9494
ListView list = (ListView)sender;
9595
HtmlContainerControl ul = (HtmlContainerControl)list.FindControl("ul");
96+
var BackButton = (HtmlContainerControl)list.FindControl("BackButton");
97+
98+
if ((BackButton != null) && (RenderBackButton))
99+
BackButton.Visible = true;
96100

97101
if (ul.Attributes["class"] == null)
98102
ul.Attributes.Add("class", "");
99103

100104
ul.Attributes["class"] += " level" + currentDepth.ToString();
101105

106+
if(currentDepth == 1)
107+
{
108+
ul.Attributes["class"] += "";
109+
}
110+
102111
if (currentDepth == 0)
103112
{
104113
ul.Attributes["class"] += " " + RootUlClasses;
@@ -223,32 +232,43 @@ protected void ItemsList_OnItemDataBound(object sender, ListViewItemEventArgs e)
223232
childItems = childItems.Where(i => i.ShowInMenu || i.RenderInFooter);
224233
}
225234

226-
if ((currentDepth < renderDepth) || (renderDepth == -1))
235+
if(!detail.CssClasses.Contains("NoChildren"))
227236
{
228-
ChildList.LayoutTemplate = ItemsList.LayoutTemplate;
229-
ChildList.ItemTemplate = ItemsList.ItemTemplate;
230-
ChildList.ItemDataBound += new EventHandler<ListViewItemEventArgs>(ItemsList_OnItemDataBound);
231-
ChildList.LayoutCreated += new EventHandler(ItemsList_OnLayoutCreated);
232-
233-
if ((childItems != null) && (IsFooterMenu))
234-
childItems = childItems.Where(i => i.RenderInFooter);
235-
else if (childItems != null)
236-
childItems = childItems.Where(i => i.ShowInMenu);
237-
238-
if (!displayProtectedSections)
237+
if ((currentDepth < renderDepth) || (renderDepth == -1))
239238
{
240-
var list = childItems.OrderBy(i => i.Media.OrderIndex).AsEnumerable();
239+
//ChildList.LayoutTemplate = ItemsList.LayoutTemplate;
240+
ChildList.ItemTemplate = ItemsList.ItemTemplate;
241+
ChildList.ItemDataBound += new EventHandler<ListViewItemEventArgs>(ItemsList_OnItemDataBound);
242+
ChildList.LayoutCreated += new EventHandler(ItemsList_OnLayoutCreated);
241243

242-
if (RenderParentItemInChildNav)
244+
if ((childItems != null) && (IsFooterMenu))
245+
childItems = childItems.Where(i => i.RenderInFooter);
246+
else if (childItems != null)
247+
childItems = childItems.Where(i => i.ShowInMenu);
248+
249+
if (!displayProtectedSections)
243250
{
244-
var parentDetails = new List<IMediaDetail>();
245-
parentDetails.Add(detail);
251+
var list = childItems.OrderBy(i => i.Media.OrderIndex).AsEnumerable();
246252

247-
list = list.Concat(parentDetails);
248-
}
253+
if (list.Any())
254+
li.Attributes["class"] += " has-children";
255+
256+
if ((currentDepth > 0) && (RenderParentItemInChildNav))
257+
{
258+
/*var parentDetails = new List<IMediaDetail>();
259+
detail.CssClasses = "NoChildren";
260+
parentDetails.Add(detail);*/
249261

250-
ChildList.DataSource = list;
251-
ChildList.DataBind();
262+
list = list.ToList();
263+
detail.CssClasses = "NoChildren";
264+
((List<IMediaDetail>)list).Insert(0, detail);
265+
266+
//list = list.Concat(parentDetails);
267+
}
268+
269+
ChildList.DataSource = list;
270+
ChildList.DataBind();
271+
}
252272
}
253273

254274
currentDepth = currentDepth - 1;
@@ -316,6 +336,7 @@ public string RootUlClasses
316336
public string TopLevelAnchorClasses { get; set; }
317337
public string SubAnchorClasses { get; set; }
318338
public string SubULClasses { get; set; }
339+
public bool RenderBackButton { get; set; }
319340

320341
public bool DisplayProtectedSections
321342
{

‎WebApplication/Controls/RenderChildren/RenderChildren.ascx.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,11 @@ protected void Page_Init(object sender, EventArgs e)
5858
Children.DataBind();
5959
}
6060

61+
if(PageSize == 0)
62+
{
63+
PageSize = children.Count();
64+
}
65+
6166
if (PageSize is int)
6267
Pager.PageSize = int.Parse(PageSize.ToString());
6368
}
@@ -95,7 +100,7 @@ protected void Children_ItemDataBound(object sender, ListViewItemEventArgs e)
95100
return;
96101

97102
var dataItem = (IMediaDetail)e.Item.DataItem;
98-
var layout = (Literal)e.Item.FindControl("Layout");
103+
var layout = (Literal)e.Item.FindControl("Layout");
99104

100105
layout.Text = MediaDetailsMapper.ParseSpecialTags(dataItem, "{" + ChildPropertyName + "}");
101106
}

0 commit comments

Comments
 (0)