Skip to content

Commit 39788e5

Browse files
byfarzinbyfarzin
committed
some issues fixed.
1 parent a7060db commit 39788e5

File tree

19 files changed

+449
-235
lines changed

19 files changed

+449
-235
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ <h2 class="page-title pull-left">{{lbl.themes}}</h2>
112112
<div class="item-info clear">
113113
<div class="pull-left item-title">{{item.Title}}</div>
114114
<div class="item-buttons pull-right">
115-
<button ng-click="setDefaultTheme(item.Id)" ng-if="item.Id != activeTheme" class="btn btn-sm btn-hasicon btn-default"><i class="fa fa-check"></i> {{lbl.active}}</button>
116-
<button class="btn btn-sm btn-icon btn-default" ng-if="item.Id === activeTheme" ng-click="showSettings(item.Id)" angular-tooltip title="Customize"><i class="fa fa-sliders"></i></button>
117-
<button ng-if="IsPrimary && item.OnlineVersion.length > 0 && item.Id != activeTheme" ng-click="uninstallPackage(item.Id)" class="btn btn-sm btn-icon btn-default" angular-tooltip tooltip="lbl.doDelete"><i class="fa fa-trash"></i></button>
118-
<button ng-if="item.OnlineVersion.length == 0 || item.OnlineVersion == item.LocalVersion" class="btn btn-sm btn-icon btn-default" ng-click="showInfo(item.Id)" angular-tooltip title="Information"> <i class="fa fa-info-circle"></i> </button>
119-
<button ng-if="item.OnlineVersion.length > 0 && item.OnlineVersion > item.LocalVersion" class="btn btn-sm btn-icon btn-default" ng-click="showInfo(item.Id)" angular-tooltip title="Information"> <i class="fa fa-info-circle notify"></i> </button>
115+
<a ng-click="setDefaultTheme(item.Id)" ng-if="item.Id != activeTheme" class="btn btn-sm btn-hasicon btn-default"><i class="fa fa-check"></i> {{lbl.active}}</a>
116+
<a class="btn btn-sm btn-icon btn-default" ng-if="item.Id === activeTheme" ng-click="showSettings(item.Id)" angular-tooltip title="Customize"><i class="fa fa-sliders"></i></a>
117+
<a ng-if="IsPrimary && item.OnlineVersion.length > 0 && item.Id != activeTheme" ng-click="uninstallPackage(item.Id)" class="btn btn-sm btn-icon btn-default" angular-tooltip tooltip="lbl.doDelete"><i class="fa fa-trash"></i></a>
118+
<a ng-if="item.OnlineVersion.length == 0 || item.OnlineVersion == item.LocalVersion" class="btn btn-sm btn-icon btn-default" ng-click="showInfo(item.Id)" angular-tooltip title="Information"> <i class="fa fa-info-circle"></i> </a>
119+
<a ng-if="item.OnlineVersion.length > 0 && item.OnlineVersion > item.LocalVersion" class="btn btn-sm btn-icon btn-default" ng-click="showInfo(item.Id)" angular-tooltip title="Information"> <i class="fa fa-info-circle notify"></i> </a>
120120
</div>
121121
</div>
122122
</div>

‎BlogEngine/BlogEngine.NET/admin/app/dashboard/dashboardView.html‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,7 @@ <h4 class="modal-title">{{lbl.trash}}</h4>
8989
<div class="panel-body">
9090
<input ng-model="qd.title" type="text" placeholder="Title" class="form-control" id="txtDraftTitle" name="txtDraftTitle" />
9191
<textarea ng-model="qd.text" placeholder="Type here..." style="margin-top: 5px" class="form-control ltr-dir" rows="2" id="txtDraftText" name="txtDraftText"></textarea>
92-
<button type="button" ng-click="postDraft()" ng-disabled="qd.title.length == 0 || qd.text.length == 0" class="btn btn-block btn-default" title="{{lbl.publish}}">
93-
{{lbl.save}}
94-
</button>
92+
<button type="button" ng-click="postDraft()" ng-disabled="qd.title.length == 0 || qd.text.length == 0" class="btn btn-block btn-default" title="{{lbl.publish}}">{{lbl.save}}</button>
9593
</div>
9694
</div>
9795
<div class="panel panel-default dashboard-list">
@@ -135,10 +133,9 @@ <h4 class="modal-title">{{lbl.trash}}</h4>
135133
<span class="item-desc text-ellipsis">{{pkg.Description}}</span>
136134
</a>
137135
</li>
138-
<li id="gal-spinner" class="list-group-item text-center">
136+
<li id="gal-spinner" class="list-group-item item-spinner">
139137
<i class="fa fa-spinner fa-spin"></i>
140138
</li>
141-
<li ng-if="packages.length == 0" class="list-group-item item-empty">{{lbl.empty}}</li>
142139
</ul>
143140
</div>
144141
<div class="panel panel-default dashboard-news dashboard-list">
@@ -149,13 +146,12 @@ <h4 class="modal-title">{{lbl.trash}}</h4>
149146
<li class="list-group-item" data-ng-repeat="n in news">
150147
<a href="{{n.OptionValue}}.aspx" target="_blank">{{n.OptionName}}</a>
151148
</li>
152-
<li id="news-spinner" class="list-group-item text-center">
149+
<li id="news-spinner" class="list-group-item item-spinner">
153150
<i class="fa fa-spinner fa-spin"></i>
154151
</li>
155-
<li ng-if="news.length == 0" class="list-group-item item-empty">{{lbl.empty}}</li>
156152
</ul>
157153
</div>
158154
</div>
159155
</div>
160156
</div>
161-
</div>
157+
</div>

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
}
99
}
1010
<div class="content" ng-controller="PageEditorController">
11+
<button tabindex="-1" class="sidebar-toggle"><span></span><span></span><span></span></button>
1112
<div class="content-pages-new-view">
1213
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
1314
<div class="modal-dialog">
@@ -58,8 +59,8 @@
5859
</div>
5960
</div>
6061
</div>
61-
@* please do not remove this page-header we used it in mobile size. *@
62-
<div class="main-header clearfix hidden">
62+
@* please do not remove this main-header we used it in mobile size. *@
63+
<div class="main-header clearfix">
6364
<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>
6465
<span ng-if="page.Id && page.IsPublished"><a href="#" class="btn btn-sm btn-warning btn-hasicon pull-left" ng-click="publish(false)"><i class="fa fa-undo"></i> {{lbl.unpublish}}</a></span>
6566
<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>
@@ -86,14 +87,16 @@
8687
</div>
8788
<div class="newpage-sidebar">
8889
<div class="newpage-sidebar-content">
89-
<span ng-if="page.Id"><a href="{{page.RelativeLink}}" class="btn btn-sm btn-block btn-success" target="_blank">{{lbl.goToPage}}</a></span>
90-
<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>
91-
<a ng-if="status() < 2" href="#" data-ng-click="publish(true)" class="btn btn-sm btn-block btn-success">{{lbl.publish}}</a>
92-
<a ng-if="status() == 2" href="#" data-ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a>
93-
<span ng-if="status() < 2"><a href="#" ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a></span>
94-
<a href="" onclick="window.history.back()" class="btn btn-block btn-sm btn-default">{{lbl.cancel}}</a>
95-
<span id="spinner" class="loaded"><i class='fa fa-spinner fa-spin fa-large'></i></span>
96-
<hr />
90+
<div class="newpage-sidebar-buttons">
91+
<span ng-if="page.Id"><a href="{{page.RelativeLink}}" class="btn btn-sm btn-block btn-success" target="_blank">{{lbl.goToPage}}</a></span>
92+
<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>
93+
<a ng-if="status() < 2" href="#" data-ng-click="publish(true)" class="btn btn-sm btn-block btn-success">{{lbl.publish}}</a>
94+
<a ng-if="status() == 2" href="#" data-ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a>
95+
<span ng-if="status() < 2"><a href="#" ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a></span>
96+
<a href="" onclick="window.history.back()" class="btn btn-block btn-sm btn-default">{{lbl.cancel}}</a>
97+
<span id="spinner" class="loaded"><i class='fa fa-spinner fa-spin fa-large'></i></span>
98+
<hr />
99+
</div>
97100
<div class="newpage-widget">
98101
<label class="newpage-widget-title" for="txtKeywords">{{lbl.keywords}}</label>
99102
<textarea class="form-control" rows="3" id="txtKeywords" data-ng-model="page.Keywords"> </textarea>

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
}
99
}
1010
<div class="content" ng-controller="PostEditorController">
11+
<button tabindex="-1" class="sidebar-toggle"><span></span><span></span><span></span></button>
1112
<div class="content-posts-new-view">
1213
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
1314
<div class="modal-dialog">
@@ -93,8 +94,8 @@
9394
</div>
9495
</div>
9596
</div>
96-
@* please do not remove this page-header we used it in mobile size. *@
97-
<div class="main-header clearfix hidden">
97+
@* please do not remove this main-header we used it in mobile size. *@
98+
<div class="main-header clearfix">
9899
<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>
99100
<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>
100101
<a ng-if="status() < 2" href="#" data-ng-click="publish(true)" class="btn btn-sm btn-hasicon btn-success pull-left"><i class="fa fa-check"></i>{{lbl.publish}}</a>
@@ -121,14 +122,16 @@
121122
</div>
122123
<div class="newpost-sidebar">
123124
<div class="newpost-sidebar-content">
124-
<span ng-if="post.Id"><a href="{{post.RelativeLink}}" class="btn btn-sm btn-block btn-success" target="_blank">{{lbl.goToPost}}</a></span>
125-
<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>
126-
<a ng-if="status() < 2" href="#" data-ng-click="publish(true)" class="btn btn-sm btn-block btn-success">{{lbl.publish}}</a>
127-
<a ng-if="status() == 2" href="#" data-ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a>
128-
<span ng-if="status() < 2"><a href="#" ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a></span>
129-
<a href="" onclick="window.history.back()" class="btn btn-block btn-sm btn-default">{{lbl.cancel}}</a>
130-
<span id="spinner" class="loaded"><i class='fa fa-spinner fa-spin fa-large'></i></span>
131-
<hr />
125+
<div class="newpost-sidebar-buttons">
126+
<span ng-if="post.Id"><a href="{{post.RelativeLink}}" class="btn btn-sm btn-block btn-success" target="_blank">{{lbl.goToPost}}</a></span>
127+
<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>
128+
<a ng-if="status() < 2" href="#" data-ng-click="publish(true)" class="btn btn-sm btn-block btn-success">{{lbl.publish}}</a>
129+
<a ng-if="status() == 2" href="#" data-ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a>
130+
<span ng-if="status() < 2"><a href="#" ng-click="save()" class="btn btn-sm btn-block btn-primary">{{lbl.save}}</a></span>
131+
<a href="" onclick="window.history.back()" class="btn btn-block btn-sm btn-default">{{lbl.cancel}}</a>
132+
<span id="spinner" class="loaded"><i class='fa fa-spinner fa-spin fa-large'></i></span>
133+
<hr />
134+
</div>
132135
<div class="newpost-widget newpost-widget-categories">
133136
<label class="newpost-widget-title">{{lbl.categories}}</label>
134137
<a angular-tooltip tooltip="lbl.add" class="pull-right add-cat" ng-click="addCagegory()"><i class="fa fa-plus fa-sm"></i></a>

0 commit comments

Comments
 (0)