Skip to content

Commit 2e5d465

Browse files
byfarzinbyfarzin
committed
NewPost fixed in chrome / Profile, Roles and Users improved.
1 parent bb5380b commit 2e5d465

11 files changed

Lines changed: 130 additions & 132 deletions

File tree

‎BlogEngine/BlogEngine.NET/Content/images/blog/noavatar.jpg‎

4.4 KB
Loading

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

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -133,62 +133,62 @@
133133
</div>
134134
</div>
135135
<div class="newpost-sidebar">
136-
<span ng-if="post.Id"><a href="{{post.RelativeLink}}" class="btn btn-sm btn-block btn-success" target="_blank">{{lbl.goToPost}}</a></span>
137-
<span ng-if="post.Id && post.IsPublished"><a href="#" class="btn btn-sm btn-block btn-warning" ng-click="publish(false)">{{lbl.unpublish}}</a></span>
138-
<a ng-if="status() < 2" href="#" data-ng-click="publish(true)" class="btn btn-sm btn-block btn-success">{{lbl.publish}}</a>
139-
<a ng-if="status() == 2" href="#" data-ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a>
140-
<span ng-if="status() < 2"><a href="#" ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a></span>
141-
<a href="" onclick="window.history.back()" class="btn btn-block btn-sm btn-default">{{lbl.cancel}}</a>
142-
<span id="spinner" class="loaded"><i class='fa fa-spinner fa-spin fa-large'></i></span>
143-
<hr />
136+
<div class="newpost-sidebar-content">
137+
<span ng-if="post.Id"><a href="{{post.RelativeLink}}" class="btn btn-sm btn-block btn-success" target="_blank">{{lbl.goToPost}}</a></span>
138+
<span ng-if="post.Id && post.IsPublished"><a href="#" class="btn btn-sm btn-block btn-warning" ng-click="publish(false)">{{lbl.unpublish}}</a></span>
139+
<a ng-if="status() < 2" href="#" data-ng-click="publish(true)" class="btn btn-sm btn-block btn-success">{{lbl.publish}}</a>
140+
<a ng-if="status() == 2" href="#" data-ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a>
141+
<span ng-if="status() < 2"><a href="#" ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a></span>
142+
<a href="" onclick="window.history.back()" class="btn btn-block btn-sm btn-default">{{lbl.cancel}}</a>
143+
<span id="spinner" class="loaded"><i class='fa fa-spinner fa-spin fa-large'></i></span>
144+
<hr />
144145

145-
146-
<div class="newpost-widget">
147-
<label class="newpost-widget-title">{{lbl.categories}}</label>
148-
<a title="{{lbl.add}}" href="" class="pull-right add-cat" ng-click="addCagegory()"><i class="fa fa-plus fa-sm"></i></a>
149-
<ul class="categories-list">
150-
<li ng-repeat="cat in lookups.CategoryList">
151-
<label>
152-
<input type="checkbox" id="cat-{{cat.OptionValue}}" data-ng-model="cat.IsSelected" />
153-
{{cat.OptionName}}
154-
</label>
155-
</li>
156-
<li ng-if="lookups.CategoryList.length == 0" class="item-empty">{{lbl.empty}}</li>
157-
</ul>
158-
</div>
159-
<div class="newpost-widget">
160-
<label class="newpost-widget-title">{{lbl.tags}}</label>
161-
<div class="post-tags-selector">
162-
<textarea id="postTags" class="form-control" style="width:100%;" placeholder="{{lbl.typeAndEnter}}..." rows="1"></textarea>
146+
<div class="newpost-widget">
147+
<label class="newpost-widget-title">{{lbl.categories}}</label>
148+
<a title="{{lbl.add}}" href="" class="pull-right add-cat" ng-click="addCagegory()"><i class="fa fa-plus fa-sm"></i></a>
149+
<ul class="categories-list">
150+
<li ng-repeat="cat in lookups.CategoryList">
151+
<label>
152+
<input type="checkbox" id="cat-{{cat.OptionValue}}" data-ng-model="cat.IsSelected" />
153+
{{cat.OptionName}}
154+
</label>
155+
</li>
156+
<li ng-if="lookups.CategoryList.length == 0" class="item-empty">{{lbl.empty}}</li>
157+
</ul>
163158
</div>
164-
</div>
165-
<div class="newpost-widget">
166-
<label class="newpost-widget-title">{{lbl.date}}</label>
167-
<input type="text" class="form-control dateFormatted" id="txtDate" name="txtDate" data-ng-model="post.DateCreated" />
168-
</div>
169-
<div class="newpost-widget" data-ng-show="lookups.PostOptions.ShowAuthors">
170-
<label class="newpost-widget-title">{{lbl.author}}</label>
171-
<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>
172-
</div>
173-
<div class="newpost-widget" data-ng-show="lookups.PostOptions.ShowCustomFields">
174-
<label class="newpost-widget-title">
175-
{{lbl.customFields}}
176-
</label>
177-
<a class="btn btn-default btn-sm btn-block" id="btnCustomFields" ng-click="showCustom()" data-toggle="modal">{{lbl.add}}</a>
178-
<div id="frm-custom-edit" ng-if="customFields && customFields.length > 0">
179-
<div class="form-group" data-ng-repeat="item in customFields">
180-
<label class="control-label">{{item.Key}}</label>
181-
<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>
182-
<input type="text" class="form-control" data-ng-model="item.Value" />
159+
<div class="newpost-widget">
160+
<label class="newpost-widget-title">{{lbl.tags}}</label>
161+
<div class="post-tags-selector">
162+
<textarea id="postTags" class="form-control" style="width:100%;" placeholder="{{lbl.typeAndEnter}}..." rows="1"></textarea>
183163
</div>
184164
</div>
165+
<div class="newpost-widget">
166+
<label class="newpost-widget-title">{{lbl.date}}</label>
167+
<input type="text" class="form-control dateFormatted" id="txtDate" name="txtDate" data-ng-model="post.DateCreated" />
168+
</div>
169+
<div class="newpost-widget" data-ng-show="lookups.PostOptions.ShowAuthors">
170+
<label class="newpost-widget-title">{{lbl.author}}</label>
171+
<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>
172+
</div>
173+
<div class="newpost-widget" data-ng-show="lookups.PostOptions.ShowCustomFields">
174+
<label class="newpost-widget-title">
175+
{{lbl.customFields}}
176+
</label>
177+
<a class="btn btn-default btn-sm btn-block" id="btnCustomFields" ng-click="showCustom()" data-toggle="modal">{{lbl.add}}</a>
178+
<div id="frm-custom-edit" ng-if="customFields && customFields.length > 0">
179+
<div class="form-group" data-ng-repeat="item in customFields">
180+
<label class="control-label">{{item.Key}}</label>
181+
<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>
182+
<input type="text" class="form-control" data-ng-model="item.Value" />
183+
</div>
184+
</div>
185+
</div>
186+
<div class="newpost-widget">
187+
<label class="enable-comment"><input type="checkbox" name="ckEnableComments" data-ng-model="post.HasCommentsEnabled" />{{lbl.enableComments}}</label>
188+
</div>
189+
<hr />
190+
<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>
185191
</div>
186-
<div class="newpost-widget">
187-
<label class="enable-comment"><input type="checkbox" name="ckEnableComments" data-ng-model="post.HasCommentsEnabled" />{{lbl.enableComments}}</label>
188-
</div>
189-
<hr />
190-
<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>
191-
192192
</div>
193193
</div>
194194
</form>

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/01.main.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
html, body {height:100%;}
2-
body { font-family: 'Roboto', sans-serif; background-color: #f6f6f6; color: #707f95; cursor: default; font-weight: 400; font-size: 14px; height: 100%; overflow-y: scroll; }
2+
body { font-family: 'Roboto', sans-serif; background-color: #f6f6f6; color: #666; cursor: default; font-weight: 400; font-size: 14px; height: 100%; overflow-y: scroll; }
33
.ltr-dir { direction: ltr; }
44
.rtl-dir { direction: rtl; }
55
a:hover, a:focus { text-decoration: none; }
@@ -12,7 +12,7 @@ input[type=checkbox] { position: relative; top: 2px; }
1212
.loading { display: inline-block; }
1313
.loaded { display: none; }
1414
.well { background-color: #fff; border-radius: 0; }
15-
hr { border-color: rgba(0, 95, 133, 0.2); }
15+
hr { border-color:#ddd; }
1616
form { margin: 0; }
1717
h1, h2, h3, h4, h5, h6 { font-weight: 500; }
1818

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/04.forms.css‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
.btn,
66
.form-control { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; }
77
.form-group { margin-bottom: 18px; }
8-
.form-group > label { font-size: 12px; font-weight: 500; color: #707f95; }
8+
.form-group > label { font-size: 12px; font-weight: 500; color: #777; }
99
.form-control { border-color: #e0e0e0; -moz-box-shadow: 0 1px 0 #eee !important; -webkit-box-shadow: 0 1px 0 #eee !important; box-shadow: 0 1px 0 #eee !important; font-weight: 400; font-size: 13px; height: 40px; padding-left: 10px; border-width: 1px; color: #888; }
1010
.form-control:focus { border-color: #c5ccd7; outline: none; }
1111
.panel .form-control { border-width: 1px; }
@@ -15,9 +15,10 @@
1515
.form-group > label.error { color: #ea5a5a !important; }
1616

1717
/*[]*/
18-
.modal-content { border-radius: 0 !important; }
18+
.modal-content { border-radius: 3px !important; border: none; }
1919
.modal-header .close { position: relative; top: 3px; margin: 0; }
2020
.modal-content .form-control { border-width: 1px; }
21+
.modal-footer .btn:focus { outline: 1px dotted rgba(255, 255, 255, 0.36); }
2122

2223
/*[BTN]*/
2324
.btn { padding: 0; font-size: 12px; letter-spacing: 1px; position: relative; color: #fff !important; -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; border: none; cursor: pointer; text-transform: uppercase; }
@@ -61,8 +62,6 @@
6162
.btn-default.btn-icon.btn-sm i { line-height: 28px; }
6263
.btn-default.btn-icon.btn-lg i { line-height: 28px; }
6364

64-
65-
6665
/*[]*/
6766
.btn-default { background: #fff; color: #888 !important; border: 1px solid #ddd; }
6867
.btn-default:hover,
@@ -105,10 +104,9 @@
105104
.dropdown-toggle.btn-sm { padding-left: 15px; padding-right: 44px; }
106105
.dropdown-toggle.btn-lg { padding-left: 25px; padding-right: 64px; }
107106

108-
109107
/*[]*/
110108
#toast-container > div { opacity: 1; }
111-
.toast { border-radius: 0 !important; opacity: 1; }
109+
.toast { opacity: 1; }
112110
.toast-success { background-color: #24b685; }
113111
.toast-error { background-color: #ea5a5a; }
114112
.toast-info { background-color: #23b1f7; }
@@ -139,3 +137,6 @@
139137
.form-width-limited { padding-left: 40px; padding-top: 40px; }
140138
.form-control { -webkit-appearance: none; -moz-appearance: none; appearance: none; }
141139
}
140+
141+
/*[]*/
142+
.input-file-hidden { width: 1px; height: 1px; display: none; visibility: hidden; opacity: 0; overflow: hidden; }

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/06.users.css‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-

2-
/*[users]*/
3-
.profile-picture { margin-right: 10px; }
4-
.profile-picture-wrpaper { position: relative; }
5-
.profile-picture-wrpaper h4 { margin: 0px; }
6-
.profile-picture-wrpaper .roles-name { margin-bottom: 8px; }
7-
.profile-picture-wrpaper .btn { margin-right: 3px; }
1+
.profile-info {margin-bottom:10px;}
2+
.profile-info .profile-info-img{ border-radius:100%; margin-right:20px; max-width:100px;}
3+
.profile-info .profile-info-title {padding-top:14px; font-size:18px; margin-bottom:3px; color:#000;}
4+
.profile-info .profile-info-role {color:#888; margin-bottom:3px;}
5+
.profile-info .btn-link-picture {display:inline-block; font-size:10px; cursor:pointer; margin-right:5px; text-transform:uppercase; color:#888;}
6+
.profile-info .btn-link-picture-change:hover {color:#00b578;}
7+
.profile-info .btn-link-picture-remove:hover {color:#dd4949;}
8+
9+
/**/
10+
.modal-roles .section-role {background:#f9f9f9; margin-bottom:10px; border:1px solid #eee;}
11+
.modal-roles .section-role-title { background:#f9f9f9; border-bottom:1px solid #eee; padding:5px 15px;}
12+
.modal-roles .section-role-body { padding:5px 0; font-size:12px;}

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/07.tables.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
.table-item-users .item-checkbox { }
8484
.table-item-users .item-title { }
8585
.table-item-users .item-roles { width: 120px; }
86-
.table-item-users .item-email { width: 120px; }
86+
.table-item-users .item-email { width: 200px; max-width:200px; padding:0 10px ; }
8787

8888

8989
.table-item-plugins { }

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/10.newpost.css‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
.newpost .content-inner form {height:100%;}
33
.newpost-wrapper {display:table; width:100%; height:100%; }
44
.newpost-wrapper .newpost-content {display:table-cell; width:100%;vertical-align:top; padding:30px; }
5-
.newpost-wrapper .newpost-sidebar {display:table-cell; min-width:200px; width:200px;vertical-align:top; max-width:200px; padding:30px;border-left:1px solid #eee; background:#fff; }
5+
.newpost-wrapper .newpost-sidebar {display:table-cell; min-width:260px; width:260px; vertical-align:top; border-left:1px solid #eee; background:#fff; }
66
.newpost-wrapper .newpost-sidebar hr {border-color:#eee;}
77
.newpost-wrapper .newpost-sidebar .btn {margin-bottom:5px;}
8-
8+
.newpost-sidebar-content {padding:30px;}
99
/**/
1010
.newpost-widget {margin-bottom:15px; }
1111
.newpost-widget .newpost-widget-title { color: #666; font-size: 11px; text-transform: uppercase; user-select: none; -moz-user-select: none; -webkit-user-select: none; }
@@ -23,7 +23,7 @@
2323
#txtTitle-error { position: absolute; background: #D8000C; color: #fff; top: 45px; left: 15px; display: inline-block; height: 20px; line-height: 20px; font-size: 12px; padding: 0 5px; z-index: 1000; text-transform: capitalize; }
2424
#txtTitle-error:before { position: absolute; top: -4px; left: 10px; border-bottom: 4px solid #D8000C; border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; display: block; }
2525

26-
/*[]*/
26+
/**/
2727
.post-tags-selector textarea { width: 180px !important; border: none !important; box-shadow: none; }
2828
.text-core { width: 100% !important; min-height: 30px !important; border: 1px solid #ddd; height: auto !important; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; padding: 4px 5px 5px; background: #fff; }
2929
.text-core .text-wrap { position: static !important; }
@@ -32,7 +32,7 @@
3232
.text-core .text-wrap .text-tags{overflow:hidden;}
3333
.text-dropdown.text-position-below { margin-top: 10px !important; left: 0; }
3434

35-
/*[]*/
35+
/**/
3636
.categories-list { max-height: 156px; overflow: auto; background: #fff; padding: 0; margin: 0; border: 1px solid #ddd; list-style: none; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; }
3737
.categories-list li { border-bottom: 1px solid #eee; }
3838
.categories-list li:last-child { border: none; }

‎BlogEngine/BlogEngine.NET/admin/views/security/profile.html‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,16 @@ <h2 class="page-title pull-left">
3131
<div class="content-inner">
3232
<div id="frm-user-edit" class="form-width-limited">
3333
<div class="form-group">
34-
<div class="profile-picture-wrpaper">
35-
<img ng-src="{{photo}}" width="80" class="pull-left profile-picture" title="Profile Picture" />
36-
<h4>{{user.Profile.DisplayName}}</h4>
37-
<div class="roles-name">{{lbl.roles}}: <span data-ng-repeat="role in user.Roles">{{role.RoleName}}</span></div>
38-
<div class="btn-group">
39-
<a class="btn btn-sm btn-hasicon btn-danger" data-ng-click="removePicture()" title="Remove Picture"><i class="fa fa-times-circle"></i> Remove</a>
40-
<a class="btn btn-sm btn-hasicon btn-primary" id="picChange" data-ng-click="changePicture()"><i class="fa fa-picture-o"></i> Change</a>
41-
<input type="file" title="Change Picture" data-role="magic-overlay" data-target="#picChange" onchange="angular.element(this).scope().changePicture(this.files)" />
42-
</div>
34+
<div class="profile-info clearfix">
35+
<img ng-src="{{photo}}" width="100" class="pull-left profile-info-img" title="Profile Picture" />
36+
<div class="profile-info-title">{{user.Profile.DisplayName}}</div>
37+
<div class="profile-info-role">{{lbl.roles}}: <span data-ng-repeat="role in user.Roles">{{role.RoleName}}</span></div>
38+
<input type="file" class="input-file-hidden" onchange="angular.element(this).scope().changePicture(this.files)" />
39+
<a class="btn-link-picture btn-link-picture-change btn-input-file prev"><i class="fa fa-picture-o"></i> Change Picture</a>
40+
<a class="btn-link-picture btn-link-picture-remove" data-ng-click="removePicture()" title="Remove Picture"><i class="fa fa-times-circle"></i> Remove Picture</a>
4341
</div>
4442
</div>
43+
<hr />
4544
<div class="form-group">
4645
<label>{{lbl.displayName}}</label>
4746
<div>
@@ -85,8 +84,10 @@ <h4>Custom field</h4>
8584
</div>
8685

8786
<script>
88-
$('[data-role=magic-overlay]').each(function () {
89-
var overlay = $(this), target = $(overlay.data('target'));
90-
overlay.css('opacity', 0).css('position', 'absolute').offset(target.offset()).width(target.outerWidth()).height(target.outerHeight());
87+
$(".btn-input-file.prev").click(function () {
88+
$(this).prev('input').click();
89+
});
90+
$(".btn-input-file.next").click(function () {
91+
$(this).next('input').click();
9192
});
9293
</script>

0 commit comments

Comments
 (0)