Skip to content

Commit 8990222

Browse files
byfarzinbyfarzin
committed
Widgets improved.
1 parent b8016f7 commit 8990222

14 files changed

Lines changed: 486 additions & 412 deletions

File tree

‎BlogEngine/BlogEngine.NET/App_Data/blogroll.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
<blogRoll>
33
<item id="25e4d8da-3278-4e58-b0bf-932496dabc96" title="Mads Kristensen" description="Full featured simplicity in ASP.NET and C#" htmlUrl="http://madskristensen.net/" xmlUrl="http://feeds.feedburner.com/netslave" xfn="contact" sortIndex="0" />
44
<item id="dcdaa78b-0b77-4691-99f0-1bb6418945a1" title="Ruslan Tur" description=".NET and Open Source: better together" htmlUrl="http://rtur.net/blog/" xmlUrl="http://feeds.feedburner.com/rtur" xfn="contact" sortIndex="2" />
5-
<item id="5368f417-6bf8-4eda-9795-41e45c7f6e2e" title="Farzin Seyfolahi" description="UI/UX Designer and Front-End Developer" htmlUrl="http://seyfolahi.net/en/" xmlUrl="http://seyfolahi.net/en/syndication.axd" xfn="contact" sortIndex="4" />
65
</blogRoll>

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

Lines changed: 106 additions & 129 deletions
Large diffs are not rendered by default.

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

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
{
1414
settings["numberofcomments"] = Request.Form["txtNumberOfComments"];
1515
Common.SaveSettings(settings, widgetId);
16-
@:<script type="text/javascript">window.parent.toastr.success("Completed");</script>
16+
@:
17+
<script type="text/javascript">window.parent.toastr.success("Completed");</script>
1718
}
1819
}
1920
if (settings != null && settings.Count > 0)
@@ -25,24 +26,19 @@
2526
<html>
2627
<head>
2728
<link rel="stylesheet" href="~/Content/bootstrap.min.css">
29+
<link rel="stylesheet" href="~/Content/font-awesome.min.css">
2830
<link rel="stylesheet" href="~/admin/themes/standard/css/styles.css">
29-
<style>
30-
body { background-color: #fff; }
31-
.field-validation-error { background-color: #d9534f; border-color: #d9534f; color: #fff; padding: 5px 15px; display: block; }
32-
</style>
3331
</head>
34-
<body>
35-
<form method="post">
36-
<div class="form-group">
37-
<label>@Resources.labels.numberOfComments</label>
38-
<input type="text" class="form-control" id="txtNumberOfComments" name="txtNumberOfComments" value="@NumberOfComments" />
39-
@Html.ValidationMessage("txtNumberOfComments")
40-
</div>
41-
<div>
42-
<button type="submit" class="btn btn-success btn-sm pull-left">
43-
@Resources.labels.save
44-
</button>
45-
</div>
46-
</form>
32+
<body class="widget-edit">
33+
<div class="widget-edit-commentlist">
34+
<form method="post">
35+
<div class="form-group">
36+
<label>@Resources.labels.numberOfComments</label>
37+
<input type="text" class="form-control" id="txtNumberOfComments" name="txtNumberOfComments" value="@NumberOfComments" />
38+
@Html.ValidationMessage("txtNumberOfComments")
39+
</div>
40+
<button type="submit" class="btn btn-success">@Resources.labels.save</button>
41+
</form>
42+
</div>
4743
</body>
4844
</html>

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

Lines changed: 67 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
{
5959
linkList.SaveLink(Request.Form["hdnId"], Request.Form["txtTitle"], Request.Form["txtUrl"], Request.Form["cbTarget"]);
6060
}
61-
@:<script type="text/javascript">window.parent.toastr.success("Completed");</script>
61+
@:
62+
<script type="text/javascript">window.parent.toastr.success("Completed");</script>
6263
}
6364
}
6465
if (settings != null && settings.Count > 0)
@@ -73,99 +74,84 @@
7374
<link rel="stylesheet" href="~/Content/bootstrap.min.css">
7475
<link rel="stylesheet" href="~/Content/font-awesome.min.css">
7576
<link rel="stylesheet" href="~/admin/themes/standard/css/styles.css">
76-
<style>
77-
body { background-color: #fff; }
78-
.fa-times { color: #e45252; }
79-
.fa-pencil { color: #25811a;}
80-
.links-row { margin: 20px 0 10px -15px; padding-top: 10px; border-top: 1px solid #ccc; border-bottom: 1px solid #ccc; }
81-
.field-validation-error { background-color: #d9534f; border-color: #d9534f; color: #fff; padding: 5px 15px; display: block; }
82-
</style>
8377
</head>
84-
<body>
85-
<form method="post">
86-
<div class="form-group">
87-
<label>@Resources.labels.numberOfDisplayedItems</label>
88-
<input type="text" class="form-control" id="txtNumberOfLinks" name="txtNumberOfLinks" value="@NumberOfLinks" />
78+
<body class="widget-edit">
79+
<div class="widget-edit-linklist">
80+
<form method="post">
81+
<div class="form-group">
82+
<label>@Resources.labels.numberOfDisplayedItems</label>
83+
<div class="input-group">
84+
<input type="text" class="form-control" id="txtNumberOfLinks" name="txtNumberOfLinks" value="@NumberOfLinks" />
85+
<div class="input-group-btn">
86+
<button type="submit" id="btnSave" name="btnSave" class="btn btn-success">@Resources.labels.save</button>
87+
</div>
88+
</div>
89+
</div>
8990
@Html.ValidationMessage("txtNumberOfLinks")
90-
</div>
91-
<div>
92-
<button type="submit" id="btnSave" name="btnSave" class="btn btn-success btn-sm pull-left">
93-
@Resources.labels.save
94-
</button>
95-
</div>
96-
<div class="clearfix">&nbsp;</div>
97-
<div class="row links-row">
98-
<div class="col-xs-6 col-md-6">
99-
<div class="form-content">
91+
<hr />
92+
<div class="form-group">
93+
<input placeholder="@Resources.labels.title" type="text" class="form-control" id="txtTitle" name="txtTitle" value="@TitleAdd" />
94+
@Html.ValidationMessage("txtTitle")
95+
</div>
96+
<div class="form-group">
97+
<input placeholder="@Resources.labels.websiteUrl" type="text" class="form-control" id="txtUrl" name="txtUrl" value="@LinkAdd" />
98+
@Html.ValidationMessage("txtUrl")
99+
</div>
100+
<div class="row">
101+
<div class="col-sm-6">
100102
<div class="form-group">
101-
<label>@Resources.labels.title</label>
102-
<input type="text" class="form-control" id="txtTitle" name="txtTitle" value="@TitleAdd" />
103-
@Html.ValidationMessage("txtTitle")
103+
@Html.CheckBox("cbTarget", targetNew) Open in new window
104104
</div>
105+
</div>
106+
<div class="col-sm-6">
105107
<div class="form-group">
106108
@if (!string.IsNullOrEmpty(editId))
107-
{
108-
<button type="submit" id="btnUpdate" name="btnUpdate" formaction="@updateLink" class="btn btn-success btn-sm pull-left">
109-
@Resources.labels.update
110-
</button>
109+
{
110+
<button type="submit" id="btnUpdate" name="btnUpdate" formaction="@updateLink" class="btn btn-success">@Resources.labels.update</button>
111111
}
112112
else
113113
{
114-
<button type="submit" id="btnAdd" name="btnAdd" class="btn btn-success btn-sm pull-left">
115-
@Resources.labels.addLink
116-
</button>
114+
<button type="submit" id="btnAdd" name="btnAdd" class="btn btn-success">@Resources.labels.addLink</button>
117115
}
118116
</div>
119117
</div>
120118
</div>
121-
<div class="col-xs-6 col-md-6">
122-
<div class="form-content">
123-
<div class="form-group">
124-
<label>@Resources.labels.websiteUrl</label>
125-
<input type="text" class="form-control" id="txtUrl" name="txtUrl" value="@LinkAdd" />
126-
@Html.ValidationMessage("txtUrl")
127-
</div>
128-
<div class="form-group">
129-
@Html.CheckBox("cbTarget", targetNew) Open in new window
130-
</div>
131-
</div>
132-
</div>
133-
</div>
134-
135-
<table class="table table-striped">
136-
<thead>
137-
<tr>
138-
<th width="10%">&nbsp;</th>
139-
<th width="35%">@Resources.labels.title</th>
140-
<th width="35%">@Resources.labels.url</th>
141-
<th width="20%">@Resources.labels.newWindow</th>
142-
</tr>
143-
</thead>
144-
<tbody>
145-
@foreach (var link in links)
119+
<table class="table">
120+
<thead>
121+
<tr>
122+
<th width="10%">&nbsp;</th>
123+
<th width="35%">@Resources.labels.title</th>
124+
<th width="35%">@Resources.labels.url</th>
125+
<th width="20%">@Resources.labels.newWindow</th>
126+
</tr>
127+
</thead>
128+
<tbody>
129+
@foreach (var link in links)
146130
{
147-
<tr>
148-
<td>
149-
<a href="?id=@widgetId&[email protected]" title="@Resources.labels.edit"><i class="fa fa-pencil"></i></a> &nbsp;
150-
<a href="?id=@widgetId&[email protected]" title="@Resources.labels.delete"><i class="fa fa-times"></i></a>
151-
</td>
152-
<td>@link.Title</td>
153-
<td>@link.Url</td>
154-
<td>
155-
@if (link.Target == "on")
156-
{
157-
<i class="fa fa-check"></i>
158-
}
159-
</td>
160-
</tr>
161-
}
162-
@if(links.Count == 0)
163-
{
164-
<tr><td colspan="4">@Resources.labels.empty</td></tr>
165-
}
166-
</tbody>
167-
</table>
168-
<input type="hidden" id="hdnId" name="hdnId" value="@hdnId" />
169-
</form>
131+
<tr>
132+
<td>
133+
<a href="?id=@widgetId&[email protected]" title="@Resources.labels.edit"><i class="fa fa-pencil"></i></a> &nbsp;
134+
<a href="?id=@widgetId&[email protected]" title="@Resources.labels.delete"><i class="fa fa-times"></i></a>
135+
</td>
136+
<td>@link.Title</td>
137+
<td>@link.Url</td>
138+
<td>
139+
@if (link.Target == "on")
140+
{
141+
<i class="fa fa-check"></i>
142+
}
143+
</td>
144+
</tr>
145+
}
146+
@if (links.Count == 0)
147+
{
148+
<tr><td colspan="4">@Resources.labels.empty</td></tr>
149+
}
150+
</tbody>
151+
</table>
152+
<input type="hidden" id="hdnId" name="hdnId" value="@hdnId" />
153+
</form>
154+
155+
</div>
170156
</body>
171157
</html>

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

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
if (IsPost)
44
{
55
var emailToDelete = Request.Form["hdnEmail"].Trim();
6-
if(emailToDelete.Length > 0)
6+
if (emailToDelete.Length > 0)
77
{
88
Newsletter.RemoveEmail(emailToDelete);
99
}
@@ -14,37 +14,31 @@
1414
<head>
1515
<link rel="stylesheet" href="~/Content/bootstrap.min.css">
1616
<link rel="stylesheet" href="~/admin/themes/standard/css/styles.css">
17-
<style>
18-
body { background-color: #fff; }
19-
.field-validation-error { background-color: #d9534f; border-color: #d9534f; color: #fff; padding: 5px 15px; display: block; }
20-
.email-delete { padding: 2px 20px 2px 2px }
21-
.email-row { display: block; padding: 3px 0; border-bottom: 1px solid #e5e5e5; }
22-
</style>
17+
2318
<script>
2419
var deleteEmail = function (email) {
2520
document.getElementById("hdnEmail").value = email;
2621
document.getElementById("frmNewsletter").submit();
2722
}
2823
</script>
2924
</head>
30-
<body>
31-
<form id="frmNewsletter" name="frmNewsletter" method="post">
32-
<div class="form-group">
33-
<h3>Subscriptions</h3>
34-
@foreach (var email in Newsletter.LoadEmails())
35-
{
36-
<div class="email-row">
37-
<a href="" onclick="deleteEmail('@email')" class="email-delete">@Resources.labels.delete</a>
38-
<span>@email</span>
25+
<body class="widget-edit">
26+
<div class="widget-edit-newsletter">
27+
<form id="frmNewsletter" name="frmNewsletter" method="post">
28+
<div class="form-group">
29+
<h4>Subscriptions</h4>
30+
<ul class="list-group">
31+
@foreach (var email in Newsletter.LoadEmails())
32+
{
33+
<li class="list-group-item"><span>@email</span> <button onclick="deleteEmail('@email')" class=" btn btn-danger btn-sm pull-right email-delete">@Resources.labels.delete</button></li>
34+
}
35+
</ul>
3936
</div>
40-
}
41-
</div>
42-
<div>
43-
<button type="submit" class="btn btn-success btn-sm pull-left">
37+
<button type="submit" class="btn btn-success">
4438
@Resources.labels.save
4539
</button>
46-
</div>
47-
<input type="hidden" id="hdnEmail" name="hdnEmail" />
48-
</form>
40+
<input type="hidden" id="hdnEmail" name="hdnEmail" />
41+
</form>
42+
</div>
4943
</body>
5044
</html>

0 commit comments

Comments
 (0)