Skip to content

Commit e0ebc29

Browse files
rxturrxtur
committed
More work on widgets framework
1 parent 61f0421 commit e0ebc29

9 files changed

Lines changed: 14952 additions & 67 deletions

File tree

‎BlogEngine/BlogEngine.Core/Data/ViewModels/WidgetsVM.cs‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ public WidgetsVM()
2727
{
2828
try
2929
{
30+
var packages = Packaging.FileSystem.LoadWidgets();
31+
AvailableWidgets = new List<WidgetItem>();
32+
foreach (var pk in packages)
33+
{
34+
AvailableWidgets.Add(new WidgetItem { Id = pk.Id, Title = pk.Title, ShowTitle = false });
35+
}
36+
37+
3038
WidgetZones = new List<WidgetZone>();
3139
WebClient client = new WebClient();
3240
var html = client.DownloadString(Utils.AbsoluteWebRoot);
@@ -45,26 +53,23 @@ public WidgetsVM()
4553
zone.Id = zoneId;
4654

4755
//var ws = new WidgetSettings(zoneId);
48-
4956
//var abc = ws.GetSettings();
50-
5157
// var x = (StringDictionary)ws.GetSettings();
5258

53-
5459
var xml = RetrieveXml(zoneId);
5560
var wd = new WidgetData { Settings = xml.InnerXml };
5661

5762
//------------------------------
5863
var widgets = xml.SelectSingleNode("widgets");
64+
zone.Widgets = new List<WidgetItem>();
5965
if (widgets != null)
6066
{
61-
zone.Widgets = new List<WidgetItem>();
6267
foreach (XmlNode node in widgets.ChildNodes)
6368
{
6469
if (node != null && node.Attributes != null)
6570
{
6671
var item = new WidgetItem();
67-
item.Id = new Guid(node.Attributes["id"].InnerText);
72+
item.Id = node.Attributes["id"].InnerText;
6873
item.Title = node.Attributes["title"].InnerText;
6974
item.ShowTitle = bool.Parse(node.Attributes["showTitle"].InnerText);
7075
zone.Widgets.Add(item);
@@ -81,11 +86,12 @@ public WidgetsVM()
8186
}
8287
catch (Exception) { }
8388
}
89+
90+
public List<WidgetItem> AvailableWidgets { get; set; }
8491
/// <summary>
8592
/// Widget zones
8693
/// </summary>
8794
public List<WidgetZone> WidgetZones { get; set; }
88-
8995
private static XmlDocument RetrieveXml(string zoneName)
9096
{
9197
var ws = new WidgetSettings(zoneName) { SettingsBehavior = new XmlDocumentBehavior() };
@@ -111,7 +117,7 @@ public class WidgetZone
111117

112118
public class WidgetItem
113119
{
114-
public Guid Id { get; set; }
120+
public string Id { get; set; }
115121
public string Title { get; set; }
116122
public bool ShowTitle { get; set; }
117123
}

‎BlogEngine/BlogEngine.NET/AppCode/Api/WidgetsController.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,9 @@ public WidgetsController(IWidgetsRepository repository)
1616
this.repository = repository;
1717
}
1818

19-
public IEnumerable<WidgetZone> Get()
19+
public WidgetsVM Get()
2020
{
21-
var widgetsVM = new WidgetsVM();
22-
return widgetsVM.WidgetZones;
21+
return new WidgetsVM();
2322
}
2423

2524
}

‎BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ static void RegisterBundles(BundleCollection bundles)
111111
.Include("~/Scripts/jquery-{version}.js")
112112
.Include("~/Scripts/jquery.form.js")
113113
.Include("~/Scripts/jquery.validate.js")
114+
.Include("~/Scripts/jquery-ui.js")
114115
.Include("~/Scripts/toastr.js")
115116
.Include("~/Scripts/bootstrap.js")
116117
.Include("~/Scripts/moment.js")

‎BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,6 +1439,7 @@
14391439
<Content Include="Scripts\i18n\angular-locale_zu.js" />
14401440
<Content Include="Scripts\jquery-2.1.4.js" />
14411441
<Content Include="Scripts\jquery-2.1.4.min.js" />
1442+
<Content Include="Scripts\jquery-ui.js" />
14421443
<Content Include="Scripts\jquery.cookie.js" />
14431444
<Content Include="Scripts\jquery-2.1.4.min.map" />
14441445
<None Include="Scripts\jquery.validate-vsdoc.js" />

0 commit comments

Comments
 (0)