Skip to content

Commit 94feed5

Browse files
committed
Widget styles to work with newer and older themes (3.3.0.1)
1 parent 7696021 commit 94feed5

16 files changed

Lines changed: 65 additions & 43 deletions

File tree

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.3.0.0")]
22+
[assembly: AssemblyVersion("3.3.0.1")]
2323
[assembly: SecurityRules(SecurityRuleSet.Level1)]

BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,7 @@
759759
<Content Include="admin\themes\standard\scss\rtl\_rtl.sidebar.scss" />
760760
<Content Include="admin\themes\standard\scss\rtl\_rtl.tables.scss" />
761761
<Content Include="admin\themes\standard\scss\styles.scss" />
762+
<Content Include="Custom\Widgets\CategoryList\edit.cshtml" />
762763
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
763764
<Content Include="Scripts\i18n\angular-locale_aa-dj.js" />
764765
<Content Include="Scripts\i18n\angular-locale_aa-er.js" />

BlogEngine/BlogEngine.NET/Custom/Widgets/Administration/widget.cshtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
}
1111
@if (Security.IsAuthenticated)
1212
{
13-
<div class="widget administration">
14-
<h4 class="widget-header">@title</h4>
15-
<div class="widget-content">
13+
<div class="Widget widget administration">
14+
<h4 class="WidgetHeader widget-header">@title</h4>
15+
<div class="WidgetContent widget-content">
1616
<ul class="toprounded" id="uxMenu_ulMenu">
1717
@if (Security.IsAuthorizedTo(Rights.ViewDashboard))
1818
{

BlogEngine/BlogEngine.NET/Custom/Widgets/AuthorList/widget.cshtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
IEnumerable<MembershipUser> users = Membership.GetAllUsers()
99
.Cast<MembershipUser>().ToList().OrderBy(a => a.UserName);
1010
}
11-
<div class="widget authorlist">
12-
<h4 class="widget-header">
11+
<div class="Widget widget authorlist">
12+
<h4 class="WidgetHeader widget-header">
1313
@title
1414
</h4>
15-
<div class="widget-content">
15+
<div class="WidgetContent widget-content">
1616
<ul id="authorlist" class="authorlist">
1717
@foreach (var user in users)
1818
{

BlogEngine/BlogEngine.NET/Custom/Widgets/BlogList/widget.cshtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
var title = Model.Title;
44
var blogs = Blog.Blogs.Where(b => b.IsActive).ToList();
55
}
6-
<div class="widget bloglist">
7-
<h4 class="widget-header">
6+
<div class="Widget widget bloglist">
7+
<h4 class="WidgetHeader widget-header">
88
@title
99
</h4>
10-
<div class="widget-content">
10+
<div class="WidgetContent widget-content">
1111
<ul>
1212
@foreach (var blog in blogs)
1313
{

BlogEngine/BlogEngine.NET/Custom/Widgets/BlogRoll/widget.cshtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
var imgPath = Utils.ApplicationRelativeWebRoot + "Content/images/blog";
88
var opmlPath = Utils.ApplicationRelativeWebRoot + "opml.axd";
99
}
10-
<div class="widget blogroll">
11-
<h4 class="widget-header">@title</h4>
12-
<div class="widget-content">
10+
<div class="Widget widget blogroll">
11+
<h4 class="WidgetHeader widget-header">@title</h4>
12+
<div class="WidgetContent widget-content">
1313
@if (rolls != null)
1414
{
1515
<ul class="xoxo">

BlogEngine/BlogEngine.NET/Custom/Widgets/CategoryList/widget.cshtml

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,22 @@
33
@{
44
var title = Model.Title;
55
var dic = CategoryList.SortCategories();
6+
7+
var settings = Common.GetSettings(Model.Id);
8+
bool showRssIcon = true;
9+
bool showPostCnt = true;
10+
if (settings.ContainsKey("showrssicon"))
11+
{
12+
showRssIcon = bool.Parse(settings["showrssicon"]);
13+
}
14+
if (settings.ContainsKey("showpostcount"))
15+
{
16+
showPostCnt = bool.Parse(settings["showpostcount"]);
17+
}
618
}
7-
<div class="widget categorylist">
8-
<h4 class="widget-header">@title</h4>
9-
<div class="widget-content">
19+
<div class="Widget widget categorylist">
20+
<h4 class="WidgetHeader widget-header">@title</h4>
21+
<div class="WidgetContent widget-content">
1022
<ul id="categorylist">
1123
@foreach (var cat in dic.Values)
1224
{
@@ -20,12 +32,21 @@
2032
<li>
2133
@if (i > 0)
2234
{
23-
<a>@Html.Raw(spaces)</a>
35+
<a>@Html.Raw(spaces)</a>
2436
}
37+
@if (showRssIcon == true)
38+
{
2539
<a rel="nofollow" href="~/category/feed/@Utils.RemoveIllegalCharacters(cat.Title)">
2640
<img class="rssButton" alt="RSS feed for SubBlog" src="~/Content/images/blog/rssButton.png">
2741
</a>
28-
<a title="Category: @cat.Title" href="~/category/@Utils.RemoveIllegalCharacters(cat.Title)">@cat.Title (@posts.ToString())</a>
42+
}
43+
<a title="Category: @cat.Title" href="~/category/@Utils.RemoveIllegalCharacters(cat.Title)">
44+
@cat.Title
45+
@if (showPostCnt)
46+
{
47+
<span>(@posts)</span>
48+
}
49+
</a>
2950
</li>
3051
}
3152
</ul>

BlogEngine/BlogEngine.NET/Custom/Widgets/CommentList/widget.cshtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
display: inline !important;
2424
}
2525
</style>
26-
<div class="widget recentcomments">
27-
<h4 class="widget-header">@Model.Title</h4>
28-
<div class="widget-content">
26+
<div class="Widget widget recentcomments">
27+
<h4 class="WidgetHeader widget-header">@Model.Title</h4>
28+
<div class="WidgetContent widget-content">
2929
<ul id="recentComments" class="recentcomments">
3030
@if (list.Count > 0)
3131
{

BlogEngine/BlogEngine.NET/Custom/Widgets/LinkList/widget.cshtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
var linkList = new LinkList(Model.Id);
44
var links = linkList.GetLinks();
55
}
6-
<div class="widget linklist">
7-
<h4 class="widget-header">@Model.Title</h4>
8-
<div class="widget-content">
6+
<div class="Widget widget linklist">
7+
<h4 class="WidgetHeader widget-header">@Model.Title</h4>
8+
<div class="WidgetContent widget-content">
99
<ul id="linkList" class="linklist">
1010
@foreach (var link in links)
1111
{

BlogEngine/BlogEngine.NET/Custom/Widgets/MonthList/widget.cshtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
var cnt = 0;
77
var cls = "open";
88
}
9-
<div class="widget monthlist">
10-
<h4 class="widget-header">@title</h4>
11-
<div class="widget-content">
9+
<div class="Widget widget monthlist">
10+
<h4 class="WidgetHeader widget-header">@title</h4>
11+
<div class="WidgetContent widget-content">
1212
<ul id="monthList">
1313
@foreach (KeyValuePair<int, List<MonthItem>> y in years)
1414
{

0 commit comments

Comments
 (0)