Skip to content

Commit e44a1b3

Browse files
rxturrxtur
committed
Updatable widget title (3.2.1.1)
1 parent 7e909df commit e44a1b3

10 files changed

Lines changed: 65 additions & 22 deletions

File tree

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public WidgetsVM()
2323
AvailableWidgets = new List<WidgetItem>();
2424
foreach (var pk in packages)
2525
{
26-
AvailableWidgets.Add(new WidgetItem { Id = pk.Id, Title = pk.Title, ShowTitle = false });
26+
AvailableWidgets.Add(new WidgetItem { Id = pk.Id, Name = pk.Title, Title = pk.Title, ShowTitle = false });
2727
}
2828

2929
WidgetZones = new List<WidgetZone>();
@@ -57,6 +57,7 @@ public WidgetsVM()
5757
{
5858
var item = new WidgetItem();
5959
item.Id = node.Attributes["id"].InnerText;
60+
item.Name = node.InnerText;
6061
item.Title = node.Attributes["title"].InnerText;
6162
item.ShowTitle = bool.Parse(node.Attributes["showTitle"].InnerText);
6263
zone.Widgets.Add(item);
@@ -113,6 +114,10 @@ public class WidgetItem
113114
/// </summary>
114115
public string Id { get; set; }
115116
/// <summary>
117+
/// Widget name
118+
/// </summary>
119+
public string Name { get; set; }
120+
/// <summary>
116121
/// Widget Title
117122
/// </summary>
118123
public string Title { get; set; }

‎BlogEngine/BlogEngine.Core/Data/WidgetsRepository.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public bool Update(List<WidgetZone> items)
4444
foreach (var widget in zone.Widgets)
4545
{
4646
XmlNode node = doc.CreateElement("widget");
47-
node.InnerText = widget.Title;
47+
node.InnerText = widget.Name;
4848

4949
var id = doc.CreateAttribute("id");
5050
// in javascript, new id initiated as random number

‎BlogEngine/BlogEngine.Core/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
[assembly: CLSCompliant(false)]
2020
[assembly: ComVisible(false)]
2121
[assembly: AllowPartiallyTrustedCallers]
22-
[assembly: AssemblyVersion("3.2.1.0")]
22+
[assembly: AssemblyVersion("3.2.1.1")]
2323
[assembly: SecurityRules(SecurityRuleSet.Level1)]

‎BlogEngine/BlogEngine.NET/Custom/Widgets/Post List/edit.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</label>
9494
</div>
9595
<div>
96-
<button type="submit" class="btn btn-success btn-sm pull-left">
96+
<button type="submit" onclick="window.parent.updateTitle()" class="btn btn-success btn-sm pull-left">
9797
@Resources.labels.save
9898
</button>
9999
</div>

‎BlogEngine/BlogEngine.NET/Custom/Widgets/RecentComments/edit.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<input type="text" class="form-control" id="txtNumberOfPosts" name="txtNumberOfComments" value="@NumberOfComments" />
2626
</div>
2727
<div>
28-
<button type="submit" class="btn btn-success btn-sm pull-left">
28+
<button type="submit" onclick="window.parent.updateTitle()" class="btn btn-success btn-sm pull-left">
2929
Save
3030
</button>
3131
</div>

‎BlogEngine/BlogEngine.NET/Custom/Widgets/Tag cloud/edit.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
@Html.DropDownList("ddCloudSize", cloudSizeOptions, new { @class = "form-control" })
6060
</div>
6161
<div>
62-
<button type="submit" class="btn btn-success btn-sm pull-left">
62+
<button type="submit" onclick="window.parent.updateTitle()" class="btn btn-success btn-sm pull-left">
6363
Save
6464
</button>
6565
</div>

‎BlogEngine/BlogEngine.NET/Custom/Widgets/TextBox/edit.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<form method="post">
4747
<textarea style="opacity:0; height:180px; width:100%;" id="txtContent" name="txtContent" class="post">@txt</textarea>
4848
<div>
49-
<button type="submit" class="btn btn-success btn-sm pull-left">
49+
<button type="submit" onclick="window.parent.updateTitle()" class="btn btn-success btn-sm pull-left">
5050
Save
5151
</button>
5252
</div>

‎BlogEngine/BlogEngine.NET/Custom/Widgets/shared.cshtml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1-
<div class="widget-content">
2-
no settings
3-
</div>
1+
<link rel="stylesheet" href="~/Content/bootstrap.min.css">
2+
<link rel="stylesheet" href="~/admin/themes/standard/css/styles.css">
3+
<style>
4+
body {
5+
background-color: #fff;
6+
}
7+
</style>
8+
<form method="post">
9+
<div>
10+
<button type="submit" onclick="window.parent.updateTitle()" class="btn btn-success btn-sm pull-left">
11+
Save
12+
</button>
13+
</div>
14+
</form>

‎BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetController.js‎

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
$scope.vm = {};
44
$scope.editSrc = {};
55
$scope.editId = {};
6+
$scope.editTitle = {};
67

78
$scope.load = function () {
89
spinOn();
@@ -31,24 +32,30 @@
3132
});
3233
}
3334

34-
$scope.loadEditForm = function (id, title) {
35+
$scope.loadEditForm = function (id, name, title) {
3536
var sharedSrc = SiteVars.ApplicationRelativeWebRoot + "Custom/Widgets/shared.cshtml";
36-
var customSrc = SiteVars.ApplicationRelativeWebRoot + "Custom/Widgets/" + title + "/edit.cshtml?id=" + id;
37-
$scope.editId = title;
37+
var customSrc = SiteVars.ApplicationRelativeWebRoot + "Custom/Widgets/" + name + "/edit.cshtml";
38+
$scope.editId = id;
39+
$scope.editTitle = title;
3840
$.ajax({
3941
type: 'HEAD',
4042
url: customSrc,
4143
async: false,
4244
success: function () {
43-
$scope.editSrc = customSrc;
45+
$scope.editSrc = customSrc + "?id=" + id;
4446
},
4547
error: function () {
46-
$scope.editSrc = sharedSrc;
48+
$scope.editSrc = sharedSrc + "?id=" + id;
4749
}
4850
});
4951
$("#edit-widget").modal();
5052
}
5153

54+
$scope.closeEditForm = function () {
55+
$("#edit-widget").modal("hide");
56+
$scope.load();
57+
}
58+
5259
$scope.moveObject = function (from, to, fromList, toList) {
5360
var item = $scope.widgetZones[fromList][from];
5461
DragDropHandler.addObject(item, $scope.widgetZones[toList], to);
@@ -82,10 +89,26 @@
8289
});
8390
}
8491

92+
$scope.updateTitle = function () {
93+
if ($scope.editTitle != $("#txtWidgetTitle").val()) {
94+
for (var i = 0; i < $scope.vm.WidgetZones.length; i++) {
95+
for (var j = 0; j < $scope.vm.WidgetZones[i].Widgets.length; j++) {
96+
if ($scope.vm.WidgetZones[i].Widgets[j].Id === $scope.editId) {
97+
$scope.vm.WidgetZones[i].Widgets[j].Title = $("#txtWidgetTitle").val();
98+
}
99+
}
100+
}
101+
$scope.save();
102+
}
103+
}
104+
85105
$scope.load();
86106

87107
$(document).ready(function () {
88108
bindCommon();
89109
});
110+
}]);
90111

91-
}]);
112+
var updateTitle = function () {
113+
angular.element($('#edit-widget')).scope().updateTitle();
114+
}

‎BlogEngine/BlogEngine.NET/admin/app/custom/widgets/widgetView.html‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@ <h2 class="page-title pull-left">{{lbl.widgets}}</h2>
1616
<div class="modal-dialog">
1717
<div class="modal-content">
1818
<div class="modal-header">
19-
<button type="button" class="close" data-dismiss="modal">&times;</button>
20-
<h4 class="modal-title">{{editId}}</h4>
19+
<button type="button" class="close" ng-click="closeEditForm()">&times;</button>
20+
<h4 class="modal-title">{{editTitle}}</h4>
2121
</div>
2222
<div class="modal-body">
23+
<div class="form-group">
24+
<label for="txtWidgetTitle">{{lbl.title}}</label>
25+
<input type="text" value="{{editTitle}}" name="txtWidgetTitle" id="txtWidgetTitle" class="form-control">
26+
</div>
2327
<iframe id="settingsFrame" ng-src="{{editSrc}}"></iframe>
2428
</div>
2529
<div class="modal-footer">
26-
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
30+
<button type="button" class="btn btn-default" ng-click="closeEditForm()">{{lbl.close}}</button>
2731
</div>
2832
</div>
2933
</div>
@@ -51,7 +55,7 @@ <h3>{{widgetZones.titles[0]}}</h3>
5155
<div class="panel-body">
5256
{{item.Title}}
5357
<div class="btn-group pull-right">
54-
<button ng-click="loadEditForm(item.Id, item.Title)" class="btn btn-default btn-sm" type="button">{{lbl.edit}}</button>
58+
<button ng-click="loadEditForm(item.Id, item.Name, item.Title)" class="btn btn-default btn-sm" type="button">{{lbl.edit}}</button>
5559
<button type="button" ng-click='deleteItem(item.Id, widgetZones.list1, widgetZones.titles[0])' class="btn btn-danger btn-sm">X</button>
5660
</div>
5761
</div>
@@ -69,7 +73,7 @@ <h3>{{widgetZones.titles[1]}}</h3>
6973
<div class="panel-body">
7074
{{ item.Title }}
7175
<div class="btn-group pull-right">
72-
<button ng-click="loadEditForm(item.Id, item.Title)" class="btn btn-default btn-sm" type="button">{{lbl.edit}}</button>
76+
<button ng-click="loadEditForm(item.Id, item.Name, item.Title)" class="btn btn-default btn-sm" type="button">{{lbl.edit}}</button>
7377
<button type="button" ng-click='deleteItem(item.Id, widgetZones.list2, widgetZones.titles[1])' class="btn btn-danger btn-sm">X</button>
7478
</div>
7579
</div>
@@ -87,7 +91,7 @@ <h3>{{widgetZones.titles[2]}}</h3>
8791
<div class="panel-body">
8892
{{ item.Title }}
8993
<div class="btn-group pull-right">
90-
<button ng-click="loadEditForm(item.Id, item.Title)" class="btn btn-default btn-sm" type="button">{{lbl.edit}}</button>
94+
<button ng-click="loadEditForm(item.Id, item.Name, item.Title)" class="btn btn-default btn-sm" type="button">{{lbl.edit}}</button>
9195
<button type="button" ng-click='deleteItem(item.Id, widgetZones.list3, widgetZones.titles[2])' class="btn btn-danger btn-sm">X</button>
9296
</div>
9397
</div>

0 commit comments

Comments
 (0)