ccardensa
diff --git a/‎BlogEngine/BlogEngine.Core/Data/ViewModels/WidgetsVM.cs‎
Lines changed: 13 additions & 7 deletions b/‎BlogEngine/BlogEngine.Core/Data/ViewModels/WidgetsVM.cs‎
Lines changed: 13 additions & 7 deletions
diff --git a/‎BlogEngine/BlogEngine.NET/AppCode/Api/WidgetsController.cs‎
Lines changed: 2 additions & 3 deletions b/‎BlogEngine/BlogEngine.NET/AppCode/Api/WidgetsController.cs‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs‎
Lines changed: 1 addition & 0 deletions b/‎BlogEngine/BlogEngine.NET/AppCode/App_Start/BlogEngineConfig.cs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj‎
Lines changed: 1 addition & 0 deletions b/‎BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj‎
Lines changed: 1 addition & 0 deletions
@@ -27,6 +27,14 @@ public WidgetsVM()
         {
             try
             {
+                var packages = Packaging.FileSystem.LoadWidgets();
+                AvailableWidgets = new List<WidgetItem>();
+                foreach (var pk in packages)
+                {
+                    AvailableWidgets.Add(new WidgetItem { Id = pk.Id, Title = pk.Title, ShowTitle = false });
+                }
+
+
                 WidgetZones = new List<WidgetZone>();
                 WebClient client = new WebClient();
                 var html = client.DownloadString(Utils.AbsoluteWebRoot);
@@ -45,26 +53,23 @@ public WidgetsVM()
                         zone.Id = zoneId;
 
                         //var ws = new WidgetSettings(zoneId);
-
                         //var abc = ws.GetSettings();
-
                         // var x = (StringDictionary)ws.GetSettings();
 
-
                         var xml = RetrieveXml(zoneId);
                         var wd = new WidgetData { Settings = xml.InnerXml };
 
                         //------------------------------
                         var widgets = xml.SelectSingleNode("widgets");
+                        zone.Widgets = new List<WidgetItem>();
                         if (widgets != null)
                         {
-                            zone.Widgets = new List<WidgetItem>();
                             foreach (XmlNode node in widgets.ChildNodes)
                             {
                                 if (node != null && node.Attributes != null)
                                 {
                                     var item = new WidgetItem();
-                                    item.Id = new Guid(node.Attributes["id"].InnerText);
+                                    item.Id = node.Attributes["id"].InnerText;
                                     item.Title = node.Attributes["title"].InnerText;
                                     item.ShowTitle = bool.Parse(node.Attributes["showTitle"].InnerText);
                                     zone.Widgets.Add(item);
@@ -81,11 +86,12 @@ public WidgetsVM()
             }
             catch (Exception) { }
         }
+        
+        public List<WidgetItem> AvailableWidgets { get; set; }
         /// <summary>
         /// Widget zones
         /// </summary>
         public List<WidgetZone> WidgetZones { get; set; }
-
         private static XmlDocument RetrieveXml(string zoneName)
         {
             var ws = new WidgetSettings(zoneName) { SettingsBehavior = new XmlDocumentBehavior() };
@@ -111,7 +117,7 @@ public class WidgetZone
 
     public class WidgetItem
     {
-        public Guid Id { get; set; }
+        public string Id { get; set; }
         public string Title { get; set; }
         public bool ShowTitle { get; set; }
     }
 
@@ -16,10 +16,9 @@ public WidgetsController(IWidgetsRepository repository)
         this.repository = repository;
     }
 
-    public IEnumerable<WidgetZone> Get()
+    public WidgetsVM Get()
     {
-        var widgetsVM = new WidgetsVM();
-        return widgetsVM.WidgetZones;
+        return new WidgetsVM();
     }
 
 }
@@ -111,6 +111,7 @@ static void RegisterBundles(BundleCollection bundles)
                 .Include("~/Scripts/jquery-{version}.js")
                 .Include("~/Scripts/jquery.form.js")
                 .Include("~/Scripts/jquery.validate.js")
+                .Include("~/Scripts/jquery-ui.js")
                 .Include("~/Scripts/toastr.js")
                 .Include("~/Scripts/bootstrap.js")
                 .Include("~/Scripts/moment.js")
 
@@ -1439,6 +1439,7 @@
     <Content Include="Scripts\i18n\angular-locale_zu.js" />
     <Content Include="Scripts\jquery-2.1.4.js" />
     <Content Include="Scripts\jquery-2.1.4.min.js" />
+    <Content Include="Scripts\jquery-ui.js" />
     <Content Include="Scripts\jquery.cookie.js" />
     <Content Include="Scripts\jquery-2.1.4.min.map" />
     <None Include="Scripts\jquery.validate-vsdoc.js" />
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,9 @@ public WidgetsController(IWidgetsRepository repository)`
`16`	`16`	`this.repository = repository;`
`17`	`17`	`}`
`18`	`18`
`19`		`- public IEnumerable<WidgetZone> Get()`
	`19`	`+ public WidgetsVM Get()`
`20`	`20`	`{`
`21`		`- var widgetsVM = new WidgetsVM();`
`22`		`- return widgetsVM.WidgetZones;`
	`21`	`+ return new WidgetsVM();`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`}`