Skip to content

Commit 5dd1c51

Browse files
byfarzinbyfarzin
committed
NewPost , NewPage, Categories and Tags improved.
1 parent 9f243dc commit 5dd1c51

10 files changed

Lines changed: 184 additions & 174 deletions

File tree

‎BlogEngine/BlogEngine.NET/admin/editors/tinymce/skins/lightgray/content.min.css‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
html, body { height: 95% !important; margin: 0; padding: 0; }
1+
html, body { height: 95% !important; margin: 0; padding: 0; line-height: 1.8; }
22
body { margin: 0 !important; padding: 2%; height: 96% !important; }
33
body { background-color: #FFF; color: #000; font-family: "Roboto", Verdana,Arial,Helvetica,sans-serif; font-size: 14px; scrollbar-3dlight-color: #F0F0EE; scrollbar-arrow-color: #676662; scrollbar-base-color: #F0F0EE; scrollbar-darkshadow-color: #DDD; scrollbar-face-color: #E0E0DD; scrollbar-highlight-color: #F0F0EE; scrollbar-shadow-color: #F0F0EE; scrollbar-track-color: #F5F5F5; }
44
td, th { font-family: "Roboto", Verdana,Arial,Helvetica,sans-serif; font-size: 13px; }
55
.mce-content-body .mce-reset { margin: 12px; padding: 0; border: 0; outline: 0; vertical-align: top; background: 0 0; text-decoration: none; color: #000; font-family: Arial; font-size: 11px; text-shadow: none; float: none; position: static; width: auto; height: auto; white-space: nowrap; cursor: inherit; line-height: normal; font-weight: 400; text-align: left; -webkit-tap-highlight-color: transparent; -moz-box-sizing: content-box; -webkit-box-sizing: content-box; box-sizing: content-box; direction: ltr; max-width: none; }
66
.mce-object { border: 1px dotted #3A3A3A; background: #d5d5d5 url(img/object.gif) no-repeat center; }
77
.mce-pagebreak { cursor: default; display: block; border: 0; width: 100%; height: 5px; border: 1px dashed #666; margin-top: 15px; page-break-before: always; }
8+
89
@media print {
910
.mce-pagebreak { border: 0; }
1011
}
12+
1113
.mce-item-anchor { cursor: default; display: inline-block; -webkit-user-select: all; -webkit-user-modify: read-only; -moz-user-select: all; -moz-user-modify: read-only; user-select: all; user-modify: read-only; width: 9px !important; height: 9px !important; border: 1px dotted #3A3A3A; background: #d5d5d5 url(img/anchor.gif) no-repeat center; }
1214
.mce-nbsp, .mce-shy { background: #AAA; }
1315
.mce-shy::after { content: '-'; }
@@ -19,5 +21,9 @@ hr { cursor: default; }
1921
.mce-item-table, .mce-item-table td, .mce-item-table th, .mce-item-table caption { border: 1px dashed #BBB; }
2022
td.mce-item-selected, th.mce-item-selected { background-color: #39f !important; }
2123
.mce-edit-focus { outline: 1px dotted #333; }
22-
p { margin: 0 0 10px; }
23-
img {max-width:100%;}
24+
p { margin: 0 0 15px; }
25+
img { max-width: 100%; }
26+
h1, h2, h3, h4, h5, h6 { margin-bottom: 0; }
27+
a { }
28+
blockquote { background: #eee; border-left: 4px solid #ccc; padding: 10px 10px 10px; }
29+
blockquote p:last-child { margin: 0; }

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

Lines changed: 114 additions & 103 deletions
Large diffs are not rendered by default.

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

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<div class="modal-body modal-roles">
1919
<div class="form-group">
2020
<label>
21-
<input type="checkbox" name="name" data-ng-model="slugOption" ng-true-value="true" ng-false-value="false" />
21+
<input type="checkbox" data-ng-model="slugOption" ng-true-value="true" ng-false-value="false" />
2222
Slug Field
2323
</label>
2424
<p class="small text-muted">Slug is optional and will auto generat from title post.</p>
@@ -52,17 +52,17 @@
5252
<div class="modal-body">
5353
<div class="form-group">
5454
<label for="txtCatTitle">{{lbl.title}}</label>
55-
<input type="text" class="form-control" id="txtCatTitle" name="txtCatTitle" data-ng-model="category.Title" focus-me="focusInput" />
55+
<input type="text" class="form-control" id="txtCatTitle" name="txtCatTitle" data-ng-model="category.Title" focus-me="focusInput" />
5656
</div>
5757
<div class="form-group">
5858
<label for="txtExcerpt">{{lbl.description}}</label>
59-
<textarea class="form-control" id="txtExcerpt" name="txtExcerpt" data-ng-model="category.Description"> </textarea>
59+
<textarea class="form-control" id="txtExcerpt" name="txtExcerpt" data-ng-model="category.Description"> </textarea>
6060
</div>
6161
<div class="form-group">
6262
<label for="selAuthors">{{lbl.parent}}</label>
63-
<select id="selAuthors" class="form-control" data-ng-options="o.OptionValue as o.OptionName for o in lookups.CategoryList" data-ng-model="category.Parent.OptionValue">
64-
<option value="">-- {{lbl.select.toLowerCase()}} --</option>
65-
</select>
63+
<select id="selAuthors" class="form-control" data-ng-options="o.OptionValue as o.OptionName for o in lookups.CategoryList" data-ng-model="category.Parent.OptionValue">
64+
<option value="">-- {{lbl.select.toLowerCase()}} --</option>
65+
</select>
6666
</div>
6767
</div>
6868
<div class="modal-footer">
@@ -73,6 +73,30 @@
7373
</div>
7474
</div>
7575
</form>
76+
<div id="modal-custom-fields" class="modal fade">
77+
<div class="modal-dialog">
78+
<div class="modal-content">
79+
<div class="modal-header">
80+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="focusInput=false"><i class="fa fa-times"></i></button>
81+
<h4 class="modal-title">{{lbl.add}} {{lbl.customFields}}</h4>
82+
</div>
83+
<div class="modal-body modal-roles">
84+
<div class="form-group">
85+
<label class="control-label" for="txtKey">Key</label>
86+
<input type="text" id="txtKey" name="txtKey" class="form-control" data-ng-model="editItem.Key" focus-me="focusInput" />
87+
</div>
88+
<div class="form-group">
89+
<label class="control-label" for="txtValue">Value</label>
90+
<input type="text" id="txtValue" name="txtValue" class="form-control" data-ng-model="editItem.Value" />
91+
</div>
92+
</div>
93+
<div class="modal-footer">
94+
<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>
95+
<button type="button" data-ng-click="addCustom()" class="btn btn-success btn-hasicon"><i class="fa fa-plus"></i>{{lbl.add}}</button>
96+
</div>
97+
</div>
98+
</div>
99+
</div>
76100
<div class="page-header clearfix">
77101
<span ng-if="post.Id"><a href="{{post.RelativeLink}}" class="btn btn-sm btn-hasicon btn-success pull-left" target="_blank"><i class="fa fa-eye"></i> {{lbl.goToPost}}</a></span>
78102
<span ng-if="post.Id && post.IsPublished"><a href="#" class="btn btn-sm btn-hasicon btn-warning pull-left" ng-click="publish(false)"><i class="fa fa-undo"></i> {{lbl.unpublish}}</a></span>
@@ -85,28 +109,6 @@
85109
</div>
86110
<div class="content-inner newpost">
87111
<form id="form" action="">
88-
<div id="modal-custom-fields" class="modal fade">
89-
<div class="modal-dialog">
90-
<div class="modal-content">
91-
<div class="modal-header">
92-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="focusInput=false"><i class="fa fa-times"></i></button>
93-
<h4 class="modal-title">{{lbl.add}}</h4>
94-
</div>
95-
<div class="modal-body modal-roles">
96-
<div class="form-group">
97-
<label class="control-label" for="txtKey">Key</label>
98-
<input type="text" id="txtKey" name="txtKey" class="form-control" data-ng-model="editItem.Key" focus-me="focusInput" />
99-
<label class="control-label" for="txtValue">Value</label>
100-
<input type="text" id="txtValue" name="txtValue" class="form-control" data-ng-model="editItem.Value" />
101-
</div>
102-
</div>
103-
<div class="modal-footer">
104-
<button type="button" data-ng-click="addCustom()" class="btn btn-success btn-tabkey pull-right"><i class="fa fa-save"></i>{{lbl.save}}</button>
105-
<button type="button" class="btn btn-default" data-dismiss="modal" ng-click="focusInput=false"><i class="fa fa-ban"></i>{{lbl.cancel}}</button>
106-
</div>
107-
</div>
108-
</div>
109-
</div>
110112
<div class="row">
111113
<div class="col-sm-8 col-md-9">
112114
<input type="text" id="txtTitle" name="txtTitle" autocomplete="off" placeholder="{{lbl.titleOfPost}}..." class="form-control newpost-title" data-ng-model="post.Title" />
@@ -157,14 +159,13 @@
157159
<select id="selAuthors" ng-disabled="usageScenario != 'multiusers'" class="form-control" data-ng-options="o.OptionName for o in lookups.AuthorList" data-ng-model="selectedAuthor"></select>
158160
</div>
159161
</div>
160-
161162
<div class="newpost-widget" data-ng-show="customFieldOption">
162163
<label class="newpost-widget-title">
163164
{{lbl.customFields}}
164165
</label>
165166
<a class="btn btn-default btn-sm btn-block" id="btnCustomFields" ng-click="showCustom()" data-toggle="modal">{{lbl.add}}</a>
166-
<div id="frm-custom-edit" ng-if="customFields && customFields.length > 0" class="form-horizontal clearfix" style="padding: 5px 0">
167-
<div data-ng-repeat="item in customFields">
167+
<div id="frm-custom-edit" ng-if="customFields && customFields.length > 0">
168+
<div class="form-group" data-ng-repeat="item in customFields">
168169
<label class="control-label">{{item.Key}}</label>
169170
<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>
170171
<input type="text" class="form-control" data-ng-model="item.Value" />

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/03.header.css‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,16 @@
3232
.page-header .icon-header-logs span {display:block; position:absolute; top:-1px; right:-1px; width:16px; height:16px; line-height:14px; background:#f8ac0e; color:#fff; font-size:10px; border-radius:100%; }
3333
.page-header .icon-header-logs:hover span {display:none;}
3434

35-
36-
3735
/*[SEARCH]*/
3836
.search { width: 30px; height: 30px; position: relative; margin-top: 0; margin-left: 15px; }
3937
.search input { outline: none !important; z-index: 6; position: absolute; left: 0; top: 0; background: none; cursor: pointer; border: none; font-size: 0; border-radius: 2px; width: 30px; height: 30px; }
4038
.search .fa-search { z-index: 5; line-height: 30px; text-align: center; position: absolute; left: 0; top: 0; background-color: #687994; color: #fff; border: none; border-radius: 0; width: 30px; height: 30px; }
4139
.search .fa-times-circle { display: none; }
42-
.search.search-wide { margin: 0; width: 100%; height: 100%; position: absolute; left: 0; top: 0; }
43-
.search.search-wide input { width: 100%; height: 100%; position: absolute; cursor: text; padding: 0 50px; font-size: 16px; border-radius: 0; background-color: #fff; left: 0; top: 0; }
40+
.search.search-wide { margin: 0; width: 100%; height: 100%; position: absolute; left: 0; top: 0; background:#eee; }
41+
.search.search-wide input { width: 100%; height: 100%; position: absolute; cursor: text; padding: 0 50px; font-size: 16px; border-radius: 0; background-color: #eee; left: 0; top: 0; }
4442
.search.search-wide .fa-search { left: 0; z-index: 7; background: none; color: #aaa; top: 15px; left: 15px; }
45-
.search.search-wide .fa-times-circle { display: block; font-size: 22px; position: absolute; width: 30px; height: 30px; right: 25px; top: 18px; z-index: 50; text-align: center; color: rgb(233, 102, 102); }
43+
.search.search-wide .fa-times-circle { display: block; font-size: 22px; position: absolute; width: 30px; height: 30px; right: 25px; top: 22px; z-index: 50; text-align: center; color: rgb(233, 102, 102); }
44+
.search.search-wide .tooltip {display:none !important;}
4645

4746
@media screen and (max-width:1024px) {
4847
.page-header { padding: 10px 10px 10px 55px; background: #f0f2f7; height: 50px; }

‎BlogEngine/BlogEngine.NET/admin/views/content/categories.html‎

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,32 @@
88
<h4 class="modal-title">{{lbl.addNewCategory}}</h4>
99
</div>
1010
<div class="modal-body">
11-
<div class="form-horizontal clearfix">
12-
<div class="form-group">
13-
<label class="control-label col-md-4" for="txtSlug">{{lbl.title}}</label>
14-
<div class="col col-md-8">
15-
<input type="text" class="form-control" id="txtSlug" name="txtSlug" data-ng-model="category.Title" focus-me="focusInput" />
16-
</div>
17-
</div>
18-
<div class="form-group">
19-
<label class="control-label col-md-4" for="txtExcerpt">{{lbl.description}}</label>
20-
<div class="col col-md-8">
21-
<textarea class="form-control" id="txtExcerpt" name="txtExcerpt" data-ng-model="category.Description"> </textarea>
22-
</div>
23-
</div>
24-
<div class="form-group">
25-
<label class="control-label col-md-4" for="selAuthors">{{lbl.parent}}</label>
26-
<div class="col col-md-8">
27-
<select id="selAuthors" class="form-control" data-ng-options="o.OptionValue as o.OptionName for o in lookups.CategoryList" data-ng-model="category.Parent.OptionValue">
28-
<option value="">-- {{lbl.select.toLowerCase()}} --</option>
29-
</select>
30-
</div>
31-
</div>
11+
<div class="form-group">
12+
<label for="txtSlug">{{lbl.title}}</label>
13+
<input type="text" class="form-control" id="txtSlug" name="txtSlug" data-ng-model="category.Title" focus-me="focusInput" />
14+
</div>
15+
<div class="form-group">
16+
<label for="txtExcerpt">{{lbl.description}}</label>
17+
<textarea class="form-control" id="txtExcerpt" name="txtExcerpt" data-ng-model="category.Description"> </textarea>
18+
</div>
19+
<div class="form-group">
20+
<label for="selAuthors">{{lbl.parent}}</label>
21+
<select id="selAuthors" class="form-control" data-ng-options="o.OptionValue as o.OptionName for o in lookups.CategoryList" data-ng-model="category.Parent.OptionValue">
22+
<option value="">-- {{lbl.select.toLowerCase()}} --</option>
23+
</select>
3224
</div>
3325
</div>
3426
<div class="modal-footer">
35-
<button type="button" ng-click="save()" class="btn btn-success pull-right btn-tabkey"><i class="fa fa-save"></i>{{lbl.save}}</button>
36-
<button type="button" class="btn btn-default" data-dismiss="modal" ng-click="focusInput=false"><i class="fa fa-ban"></i>{{lbl.cancel}}</button>
27+
<button type="button" class="btn btn-default btn-hasicon" tabindex="-1" data-dismiss="modal" ng-click="focusInput=false"><i class="fa fa-ban"></i>{{lbl.cancel}}</button>
28+
<button type="button" ng-click="save()" class="btn btn-success btn-hasicon"><i class="fa fa-check"></i>{{lbl.save}}</button>
3729
</div>
3830
</div>
3931
</div>
4032
</div>
4133
</form>
4234
<div class="page-header clearfix">
43-
<h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
35+
<h2 class="page-title pull-left">
36+
<a href="#" class="help-link" data-title=""><i class="fa fa-question-circle"></i></a>
4437
{{lbl.categories}} <span id="spinner" class="loaded"><i class="fa fa-spinner fa-spin fa-sm"></i></span>
4538
</h2>
4639
<a data-ng-click="addNew()" class="btn btn-success btn-hasicon btn-sm pull-left"><i class="fa fa-plus"></i>{{lbl.add}}</a>
@@ -49,7 +42,7 @@ <h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i
4942
</div>
5043
<div class="search pull-right">
5144
<i class="fa fa-search"></i>
52-
<input type="text" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}" />
45+
<input type="text" angular-tooltip tooltip="lbl.search" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}" />
5346
<i class="fa fa-times-circle"></i>
5447
</div>
5548
</div>

‎BlogEngine/BlogEngine.NET/admin/views/content/comments.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h2 class="page-title pull-left">
3333
</div>
3434
<div class="search pull-right">
3535
<i class="fa fa-search"></i>
36-
<input type="text" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}" />
36+
<input type="text" angular-tooltip tooltip="lbl.search" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}" />
3737
<i class="fa fa-times-circle"></i>
3838
</div>
3939

‎BlogEngine/BlogEngine.NET/admin/views/content/filters.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ <h2 class="page-title pull-left">
7070
</div>
7171
<div class="search pull-right">
7272
<i class="fa fa-search"></i>
73-
<input type="text" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}" />
73+
<input type="text" angular-tooltip tooltip="lbl.search" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}" />
7474
<i class="fa fa-times-circle"></i>
7575
</div>
7676
</div>

‎BlogEngine/BlogEngine.NET/admin/views/content/pages.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h2 class="page-title pull-left"> <a href="#" class="help-link" data-title=""><i
1111
</div>
1212
<div class="search pull-right">
1313
<i class="fa fa-search"></i>
14-
<input type="text" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}" />
14+
<input type="text" angular-tooltip tooltip="lbl.search" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}" />
1515
<i class="fa fa-times-circle"></i>
1616
</div>
1717
<div class="dropdown pull-right">

‎BlogEngine/BlogEngine.NET/admin/views/content/posts.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h2 class="page-title pull-left">
1212
</div>
1313
<div class="search pull-right">
1414
<i class="fa fa-search"></i>
15-
<input type="text" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}" />
15+
<input type="text" angular-tooltip tooltip="lbl.search" ng-model="query" ng-change="search()" placeholder="{{lbl.search}}" />
1616
<i class="fa fa-times-circle"></i>
1717
</div>
1818
<div class="dropdown pull-right">

0 commit comments

Comments
 (0)