Skip to content

Commit 286b007

Browse files
author
FrancisCorona
committed
NewPage and Themes improved.
1 parent d566428 commit 286b007

File tree

6 files changed

+100
-72
lines changed

6 files changed

+100
-72
lines changed

‎BlogEngine/BlogEngine.NET/admin/app/custom/themes/themeView.html

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="focusInput=false"><i class="fa fa-times"></i></button>
88
<h4 class="modal-title">{{package.Title}}</h4>
99
</div>
10-
<div class="modal-body">
11-
<div class="modal-theme-info">
12-
<p ng-bind-html="package.Description"></p>
13-
<hr />
10+
<div class="modal-body modal-package">
11+
<div class="modal-package-info">
12+
<p class="item-desc" ng-bind-html="package.Description"></p>
1413
<div class="form-horizontal">
1514
<div class="form-group">
1615
<span class="col-md-3">{{lbl.author}}</span>
@@ -39,32 +38,42 @@ <h4 class="modal-title">{{package.Title}}</h4>
3938
<div class="col-md-9">{{package.DownloadCount}}</div>
4039
</div>
4140
</div>
42-
<hr />
41+
</div>
42+
<div class="modal-package-image">
4343
<img ng-if="!package.PackageUrl" ng-src="{{package.IconUrl}}" alt="Package image" title="" />
4444
<a ng-if="package.PackageUrl" href="{{package.PackageUrl}}" target="_blank">
4545
<img class="pkg-img" ng-src="{{package.IconUrl}}" alt="Package image" title="" />
4646
</a>
4747
</div>
48-
49-
<div ng-if="package.Extra != null">
48+
<div class="modal-package-review" ng-if="package.Extra != null">
5049
<div class="panel panel-default">
5150
<div class="panel-heading">
5251
<div class="panel-title">{{lbl.writeReview}}</div>
5352
</div>
5453
<div class="panel-body">
55-
<input class="form-control ltr-dir" style="margin-bottom: 10px" ng-model="author" id="txtAuthor" name="txtAuthor" focus-me="focusInput" type="text" placeholder="author">
56-
<textarea rows="3" maxlength="450" style="width: 100%; height: 68px; margin-bottom: 15px" class="form-control" id="txtReview" placeholder="{{lbl.typeHere}}"></textarea>
57-
<div class="text-right">
58-
<span class="star-rating">
54+
<div class="form-group">
55+
<input class="form-control ltr-dir" ng-model="author" id="txtAuthor" name="txtAuthor" focus-me="focusInput" type="text" placeholder="author">
56+
</div>
57+
<div class="form-group">
58+
<textarea rows="3" maxlength="450" class="form-control" id="txtReview" placeholder="{{lbl.typeHere}}"></textarea>
59+
</div>
60+
<div class="clearfix">
61+
<div class="star-rating pull-left">
5962
<input type="radio" name="rated" value="1" ng-checked="selectedRating == 1" ng-click="setRating(1)"><i></i>
6063
<input type="radio" name="rated" value="2" ng-checked="selectedRating == 2" ng-click="setRating(2)"><i></i>
6164
<input type="radio" name="rated" value="3" ng-checked="selectedRating == 3" ng-click="setRating(3)"><i></i>
6265
<input type="radio" name="rated" value="4" ng-checked="selectedRating == 4" ng-click="setRating(4)"><i></i>
6366
<input type="radio" name="rated" value="5" ng-checked="selectedRating == 5" ng-click="setRating(5)"><i></i>
64-
</span>
65-
<button data-ng-click="submitRating()" class="btn btn-success "><i class="fa fa-star"></i>Rate</button>
67+
</div>
68+
<button data-ng-click="submitRating()" class=" pull-right btn btn-success btn-sm">Submit</button>
6669
</div>
6770
</div>
71+
</div>
72+
73+
<div class="panel panel-default">
74+
<div class="panel-heading">
75+
<div class="panel-title">user</div>
76+
</div>
6877
<ul ng-if="package.Extra.Reviews != null" class="list-group">
6978
<li ng-repeat="review in package.Extra.Reviews" class="list-group-item">
7079
<span class="badge">{{review.Rating}}</span>
@@ -98,7 +107,7 @@ <h4 class="modal-title">{{lbl.customFields}}</h4>
98107
</div>
99108
<div class="modal-footer">
100109
<button type="button" class="btn btn-hasicon btn-default" tabindex="-1" data-dismiss="modal" ng-click="focusInput=false"><i class="fa fa-ban"></i>{{lbl.cancel}}</button>
101-
<button data-ng-if="customFields.length > 0" data-ng-click="save()" class="btn btn-success btn-header pull-right"><i class="fa fa-save"></i>{{lbl.save}}</button>
110+
<button data-ng-if="customFields.length > 0" data-ng-click="save()" class="btn btn-success btn-hasicon btn-header pull-right"><i class="fa fa-save"></i>{{lbl.save}}</button>
102111
</div>
103112
</div>
104113
</div>

‎BlogEngine/BlogEngine.NET/admin/app/editor/editpage.cshtml

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Security.RedirectForUnauthorizedRequest();
88
}
99
}
10-
<div class="content" ng-controller="PageEditorController">
10+
<div class="content newpost" ng-controller="PageEditorController">
1111
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
1212
<div class="modal-dialog">
1313
<div class="modal-content">
@@ -21,21 +21,18 @@
2121
<input type="checkbox" name="name" data-ng-model="lookups.PageOptions.ShowSlug" ng-true-value="true" ng-false-value="false" />
2222
Slug Field
2323
</label>
24-
<p class="small text-muted">Slug is optional and will auto generat from title page.</p>
2524
</div>
2625
<div class="form-group">
2726
<label>
2827
<input type="checkbox" name="name" data-ng-model="lookups.PageOptions.ShowDescription" ng-true-value="true" ng-false-value="false" />
2928
Description Field
3029
</label>
31-
<p class="small text-muted">Description is optional and will auto generat from content page.</p>
3230
</div>
3331
<div class="form-group">
3432
<label>
3533
<input type="checkbox" name="name" data-ng-model="lookups.PageOptions.ShowCustomFields" ng-true-value="true" ng-false-value="false" />
36-
Custom Field
34+
Custom Field <a href="http://www.dnbe.net/docs/post/custom-fields" target="_blank">(Learn more)</a>
3735
</label>
38-
<p class="small text-muted">Custom Field is a feature for advanced blogging. <a href="#">Learn more.</a></p>
3936
</div>
4037
</div>
4138
<div class="modal-footer">
@@ -70,7 +67,7 @@
7067
</div>
7168
</div>
7269

73-
<div class="page-header clearfix">
70+
<div class="page-header hidden clearfix">
7471
<span ng-if="page.Id"><a href="{{page.RelativeLink}}" class="btn btn-success btn-sm btn-hasicon pull-left" target="_blank"><i class="fa fa-eye"></i> {{lbl.goToPage}}</a></span>
7572
<a ng-if="status() == 2" href="#" data-ng-click="save()" class="btn btn-primary btn-sm btn-hasicon pull-left"><i class="fa fa-save"></i>{{lbl.save}}</a>
7673
<a ng-if="status() < 2" href="#" data-ng-click="publish(true)" class="btn btn-sm btn-success btn-hasicon pull-left"><i class="fa fa-check"></i>{{lbl.publish}}</a>
@@ -80,11 +77,11 @@
8077
<a href="" onclick="window.history.back()" class="btn btn-default btn-sm btn-hasicon pull-right"><i class="fa fa-ban"></i>{{lbl.cancel}}</a>
8178
<span id="spinner" class="loaded pull-left"><i class='fa fa-spinner fa-spin fa-large'></i></span>
8279
</div>
83-
<div class="content-inner newpost">
80+
<div class="content-inner">
8481
<form id="form" action="">
85-
<div class="row">
86-
<div class="col-sm-8 col-md-9">
87-
<input type="text" id="txtTitle" name="txtTitle" autocomplete="off" placeholder="{{lbl.titleOfPage}}..." class="form-control newpost-title" data-ng-model="page.Title" />
82+
<div class="newpost-wrapper">
83+
<div class="newpost-content">
84+
<input type="text" id="txtTitle" name="txtTitle" autocomplete="off" placeholder="{{lbl.titleOfPage}}..." class="form-control newpost-title" data-ng-model="page.Title" />
8885
<div class="editor-wrapper">
8986
@RenderPage(BlogConfig.DefaultEditor)
9087
</div>
@@ -97,8 +94,18 @@
9794
<textarea class="form-control" rows="4" id="txtExcerpt" data-ng-model="page.Description"> </textarea>
9895
</div>
9996
</div>
100-
<div class="col-sm-4 col-md-3">
101-
<div class="newpost-widget-wrapper">
97+
<div class="newpost-sidebar">
98+
99+
<div class="newpost-sidebar-content">
100+
<span ng-if="page.Id"><a href="{{page.RelativeLink}}" class="btn btn-success btn-block btn-sm" target="_blank"> {{lbl.goToPage}}</a></span>
101+
<span ng-if="page.Id && page.IsPublished"><a href="#" class="btn btn-sm btn-block btn-warning" ng-click="publish(false)">{{lbl.unpublish}}</a></span>
102+
<a ng-if="status() == 2" href="#" data-ng-click="save()" class="btn btn-primary btn-block btn-sm">{{lbl.save}}</a>
103+
<a ng-if="status() < 2" href="#" data-ng-click="publish(true)" class="btn btn-sm btn-block btn-success">{{lbl.publish}}</a>
104+
<span ng-if="status() < 2"><a href="#" ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a></span>
105+
<a href="" onclick="window.history.back()" class="btn btn-default btn-block btn-sm">{{lbl.cancel}}</a>
106+
<span id="spinner" class="loaded pull-left"><i class='fa fa-spinner fa-spin fa-large'></i></span>
107+
108+
<hr />
102109
<div class="newpost-widget">
103110
<label class="newpost-widget-title" for="txtKeywords">{{lbl.keywords}}</label>
104111
<textarea class="form-control" rows="2" id="txtKeywords" data-ng-model="page.Keywords"> </textarea>
@@ -115,32 +122,33 @@
115122
<label class="newpost-widget-title" for="txtSortOrder">{{lbl.sortOrder}}</label>
116123
<input type="text" class="form-control" id="txtSortOrder" data-ng-model="page.SortOrder" />
117124
</div>
118-
<div class="newpost-widget-wrapper">
119-
<div class="newpost-widget">
120-
<label>
121-
<input type="checkbox" data-ng-model="page.IsFrontPage" name="cbFrontPage" />
122-
{{lbl.isFrontPage}}
123-
</label>
124-
</div>
125-
<div class="newpost-widget">
126-
<label>
127-
<input type="checkbox" data-ng-model="page.ShowInList" name="cbShowInList" />
128-
{{lbl.showInList}}
129-
</label>
130-
</div>
125+
<div class="newpost-widget">
126+
<label>
127+
<input type="checkbox" data-ng-model="page.IsFrontPage" name="cbFrontPage" />
128+
{{lbl.isFrontPage}}
129+
</label>
131130
</div>
132-
</div>
133-
<div class="newpost-widget" data-ng-show="lookups.PageOptions.ShowCustomFields">
134-
<label class="newpost-widget-title">{{lbl.customFields}}</label>
135-
<a class="btn btn-default btn-sm btn-block" id="btnCustomFields" ng-click="showCustom()" data-toggle="modal">{{lbl.add}}</a>
136-
<div id="frm-custom-edit" ng-if="customFields && customFields.length > 0">
137-
<div class="form-group" data-ng-repeat="item in customFields">
138-
<label class="control-label">{{item.Key}}</label>
139-
<a href="" ng-click="deleteCustom(item.Key, item.ObjectId)" title="{{lbl.doDelete}}" class="pull-right" style="position: relative; top: 10px; color: red"><i class="fa fa-times"></i></a>
140-
<input type="text" class="form-control" data-ng-model="item.Value" />
131+
<div class="newpost-widget">
132+
<label>
133+
<input type="checkbox" data-ng-model="page.ShowInList" name="cbShowInList" />
134+
{{lbl.showInList}}
135+
</label>
136+
</div>
137+
<div class="newpost-widget" data-ng-show="lookups.PageOptions.ShowCustomFields">
138+
<label class="newpost-widget-title">{{lbl.customFields}}</label>
139+
<a class="btn btn-default btn-sm btn-block" id="btnCustomFields" ng-click="showCustom()" data-toggle="modal">{{lbl.add}}</a>
140+
<div id="frm-custom-edit" ng-if="customFields && customFields.length > 0">
141+
<div class="form-group" data-ng-repeat="item in customFields">
142+
<label class="control-label">{{item.Key}}</label>
143+
<a href="" ng-click="deleteCustom(item.Key, item.ObjectId)" title="{{lbl.doDelete}}" class="pull-right" style="position: relative; top: 10px; color: red"><i class="fa fa-times"></i></a>
144+
<input type="text" class="form-control" data-ng-model="item.Value" />
145+
</div>
141146
</div>
142147
</div>
148+
<hr />
149+
<a class="btn btn-sm btn-hasicon btn-block btn-default" data-toggle="modal" data-target="#myModal"><i class="fa fa-sliders"></i> Customize</a>
143150
</div>
151+
144152
</div>
145153
</div>
146154
</form>

‎BlogEngine/BlogEngine.NET/admin/app/editor/editpost.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<a href="" onclick="window.history.back()" class="btn btn-sm btn-hasicon btn-default pull-right"><i class="fa fa-ban"></i>{{lbl.cancel}}</a>
115115
<span id="spinner" class="loaded pull-right"><i class='fa fa-spinner fa-spin fa-large'></i></span>
116116
</div>
117-
<div class="content-inner ">
117+
<div class="content-inner">
118118
<form id="form" action="">
119119
<div class="newpost-wrapper">
120120
<div class="newpost-content">

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/09.custom.css

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*[]*/
2-
.form-customfiled label {font-size:12px;}
3-
.form-customfiled .form-group {margin-bottom:5px;}
4-
.form-customfiled .form-control {height:30px; padding:0 10px;}
2+
.form-customfiled label { font-size: 12px; }
3+
.form-customfiled .form-group { margin-bottom: 5px; }
4+
.form-customfiled .form-control { height: 30px; padding: 0 10px; }
55

66

77
/**/
@@ -32,21 +32,37 @@
3232
/*[]*/
3333

3434
.theme-item { padding: 2px; background-color: #fff; border: 1px solid #e9e9e9; position: relative; height: 300px; margin-bottom: 30px; -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; -moz-box-shadow: 0 1px 0 #f1f1f1; -webkit-box-shadow: 0 1px 0 #f1f1f1; box-shadow: 0 1px 0 #f1f1f1; }
35-
.theme-item .item-img { position:relative; background: #fff; overflow: hidden; height: 100%; -webkit-border-top-left-radius: 3px; -webkit-border-top-right-radius: 3px; -moz-border-radius-topleft: 3px; -moz-border-radius-topright: 3px; border-top-left-radius: 3px; border-top-right-radius: 3px; }
35+
.theme-item .item-img { position: relative; background: #fff; overflow: hidden; height: 100%; -webkit-border-top-left-radius: 3px; -webkit-border-top-right-radius: 3px; -moz-border-radius-topleft: 3px; -moz-border-radius-topright: 3px; border-top-left-radius: 3px; border-top-right-radius: 3px; }
3636
.theme-item .item-img img { width: 100%; }
3737
.theme-item .item-checkbox { position: absolute; top: 15px; left: 15px; margin: 0; -moz-transition: all ease .5s; -o-transition: all ease .5s; -webkit-transition: all ease .5s; transition: all ease .5s; opacity: 0; }
3838
.theme-item:hover .item-checkbox { opacity: 1; }
3939
.theme-item .item-checkbox:disabled { display: none; }
40-
.theme-item .item-info { border: 2px solid #fafafa; border-top:1px solid #eee; position: absolute; bottom: 0; left: 0; background: #fafafa; width: 100%; margin: 0; padding: 10px; -webkit-border-bottom-right-radius: 3px; -webkit-border-bottom-left-radius: 3px; -moz-border-radius-bottomright: 3px; -moz-border-radius-bottomleft: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; }
40+
.theme-item .item-info { border: 2px solid #fafafa; border-top: 1px solid #eee; position: absolute; bottom: 0; left: 0; background: #fafafa; width: 100%; margin: 0; padding: 10px; -webkit-border-bottom-right-radius: 3px; -webkit-border-bottom-left-radius: 3px; -moz-border-radius-bottomright: 3px; -moz-border-radius-bottomleft: 3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px; }
4141
.theme-item.theme-item-active { background: #1cac7b; border-color: #1cac7b; }
42-
.theme-item.theme-item-active .btn-default {border-color:#109a6b; border-radius:3px; overflow:hidden;}
43-
.theme-item.theme-item-active .btn-default:hover {border-color:#109a6b !important;}
42+
.theme-item.theme-item-active .btn-default { border-color: #109a6b; border-radius: 3px; overflow: hidden; }
43+
.theme-item.theme-item-active .btn-default:hover { border-color: #109a6b !important; }
4444
.theme-item.theme-item-active .item-info { background: #1cac7b; border-color: #1cac7b; color: #fff; }
45-
.theme-item .item-title { position:relative; top:5px; margin: 0; }
46-
.theme-item .item-active {position:absolute; top:0; left:0; width:100%; color:#1cac7b; margin:0; font-size:40px; text-align:center; line-height:300px; height:100%; background:rgba(0, 0, 0, 0.10);}
47-
48-
.modal-theme-info {padding:0px;}
49-
.modal-theme-info label {font-size:12px;}
50-
.modal-theme-info .form-group {margin-bottom:5px;}
51-
.modal-theme-info hr {border-color:#eee;}
52-
.modal-theme-info img {width:100%; max-width:100%;}
45+
.theme-item .item-title { position: relative; top: 5px; margin: 0; }
46+
.theme-item .item-active { position: absolute; top: 0; left: 0; width: 100%; color: #1cac7b; margin: 0; font-size: 40px; text-align: center; line-height: 300px; height: 100%; background: rgba(0, 0, 0, 0.10); }
47+
48+
49+
/**/
50+
/*.modal-theme-info { padding: 0px; }
51+
.modal-theme-info label { font-size: 12px; }
52+
.modal-theme-info .form-group { margin-bottom: 5px; }
53+
.modal-theme-info hr { border-color: #eee; }
54+
*/
55+
56+
57+
/**/
58+
.modal-package { padding: 0 !important; }
59+
.modal-package-info { padding: 30px; background: #fff; }
60+
.modal-package-info p {margin-bottom:20px;}
61+
62+
.modal-package-info .form-group {margin-bottom:3px;font-size:13px;}
63+
.modal-package-info .form-group:last-child{margin-bottom:0;}
64+
.modal-package-review { padding: 30px; background: #eee; }
65+
66+
.modal-package-review .panel:last-child {margin-bottom:0;}
67+
.modal-package-image{padding:30px; border-top:1px solid #eee;}
68+
.modal-package-image img {width:100%;}

0 commit comments

Comments
 (0)