Skip to content

Commit f2dd7aa

Browse files
author
Francis Corona
committed
refactoring Buttons and Forms, some issues fixed.
1 parent f2f21a5 commit f2dd7aa

34 files changed

+1468
-2947
lines changed

‎BlogEngine/BlogEngine.NET/BlogEngine.NET.csproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,6 @@
667667
<Content Include="admin\themes\standard\sass\base\_variables.scss" />
668668
<Content Include="admin\themes\standard\sass\layout\_main.scss" />
669669
<Content Include="admin\themes\standard\sass\layout\_sidebar.scss" />
670-
<Content Include="admin\themes\standard\sass\modules\_btn.scss" />
671670
<Content Include="admin\themes\standard\sass\modules\_forms.scss" />
672671
<Content Include="admin\themes\standard\sass\styles.scss" />
673672
<Content Include="admin\themes\standard\css\styles.css.map" />
@@ -702,6 +701,10 @@
702701
<Content Include="admin\themes\standard\sass\pages\content\_pages.new.scss" />
703702
<Content Include="admin\themes\standard\sass\pages\content\_comments.filters.scss" />
704703
<Content Include="admin\themes\standard\sass\modules\_filemanager.scss" />
704+
<Content Include="admin\themes\standard\sass\modules\_buttons.scss" />
705+
<Content Include="admin\themes\standard\sass\modules\_alerts.scss" />
706+
<Content Include="admin\themes\standard\sass\modules\_pagination.scss" />
707+
<Content Include="admin\themes\standard\sass\modules\_dropdown.scss" />
705708
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
706709
<Content Include="Scripts\i18n\angular-locale_aa-dj.js" />
707710
<Content Include="Scripts\i18n\angular-locale_aa-er.js" />

‎BlogEngine/BlogEngine.NET/admin/about.cshtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
};
4040
}
4141
<div ng-controller="AboutController" class="about-view content">
42+
<button tabindex="-1" class="sidebar-toggle"><span></span><span></span><span></span></button>
4243
<div class="main-header clearfix">
4344
<h2 class="page-title pull-left">About</h2>
4445
</div>

‎BlogEngine/BlogEngine.NET/admin/app/common.js

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,32 +150,35 @@ function getFromQueryString(param) {
150150
}
151151

152152
function bindCommon() {
153+
153154
//
154155
$(".dropdown-menu-filter li a").click(function () {
155156
$(this).parents(".dropdown").find('.btn').html('<span class="show-label"></span> ' + $(this).text() + ' <i class="fa fa-angle-down"></i>');
156157
$(this).parents(".dropdown").find('.btn').val($(this).data('value'));
157158
});
158159

159-
//
160-
$(".page-header .btn, .help-link").tooltip({
161-
placement: "bottom",
162-
container: '.page-header',
163-
});
164-
165160
//
166161
$(".search input").focus(function () {
167-
$(".search").addClass("search-wide");
162+
$(".search").addClass("active");
168163
});
169164
$('.search input').blur(function () {
170165
if ($(this).val().length == 0) {
171-
$(".search").removeClass("search-wide");
166+
$(".search").removeClass("active");
172167
}
173168
});
169+
174170
//
175171
$(".btn-input-file.prev").click(function () {
176172
$(this).prev('input').click();
177173
});
178174
$(".btn-input-file.next").click(function () {
179175
$(this).next('input').click();
180176
});
177+
178+
//
179+
$(".main-header .btn").tooltip({
180+
placement: "bottom",
181+
container: '.main-header',
182+
});
183+
181184
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h4 class="modal-title">{{lbl.logFile}}</h4>
88
</div>
99
<div class="modal-body logs-list">
1010
<div class="form-group">
11-
<textarea ng-bind="vm.Logs" rows="12" maxlength="450" class="form-control" id="txtLogs"></textarea>
11+
<textarea ng-bind="vm.Logs" readonly="readonly" rows="12" maxlength="450" class="form-control" id="txtLogs"></textarea>
1212
</div>
1313
<div class="modal-buttons text-right">
1414
<button type="button" data-ng-if="vm.Logs.length > 0" data-ng-click="purgeLog()" class="btn btn-hasicon btn-danger"><i class="fa fa-trash"></i> {{lbl.purge}}</button>
@@ -158,4 +158,4 @@ <h4 class="modal-title">{{lbl.trash}}</h4>
158158
</div>
159159
</div>
160160
</div>
161-
</div>
161+
</div>

‎BlogEngine/BlogEngine.NET/admin/app/security/profile/profileView.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ <h2 class="page-title pull-left">{{lbl.myProfile}}</h2>
2929
<a href="{{SiteVars.RelativeWebRoot}}Account/change-password.aspx" class="btn btn-default btn-sm btn-hasicon pull-right"><i class="fa fa-key"></i>{{lbl.changePassword}}</a>
3030
</div>
3131
<div class="content-inner">
32-
<div id="frm-user-edit" class="form-width-limited">
32+
<div id="frm-user-edit" class="form-content">
3333
<div class="form-group">
3434
<div class="profile-info clearfix">
3535
<img ng-src="{{photo}}" width="100" class="pull-left profile-info-img" title="Profile Picture" />

‎BlogEngine/BlogEngine.NET/admin/app/settings/advancedView.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ <h2 class="page-title pull-left">{{lbl.advanced}}</h2>
55
<button data-ng-click="save()" class="btn btn-success btn-sm btn-hasicon pull-left" type="button"><i class="fa fa-check"></i>{{lbl.save}}</button>
66
</div>
77
<div class="content-inner">
8-
<div class="form-width-limited">
8+
9+
<div class="form-content">
10+
<h4>General</h4>
911
<div class="form-group">
1012
<label>{{lbl.handleWwwSubdomain}}</label>
1113
<div class="row">
@@ -22,8 +24,7 @@ <h2 class="page-title pull-left">{{lbl.advanced}}</h2>
2224
<div class="checkbox"><label><input type="checkbox" name="ckShowPostNavigation" data-ng-model="settings.ShowPostNavigation" /> {{lbl.showPostNavigation}}</label></div>
2325
<div class="checkbox"><label><input type="checkbox" name="ckEnablePasswordReset" data-ng-model="settings.EnablePasswordReset" /> {{lbl.enablePasswordReset}}</label></div>
2426
</div>
25-
<hr />
26-
<h4>{{lbl.comments}}</h4><br />
27+
<h4>{{lbl.comments}}</h4>
2728
<div class="form-group">
2829
<label>{{lbl.enableTrackbacks}}</label>
2930
<div class="row">
@@ -38,7 +39,6 @@ <h4>{{lbl.comments}}</h4><br />
3839
<div class="col-md-6"><label><input type="checkbox" name="ckEnableTrackBackReceive" data-ng-model="settings.EnableTrackBackReceive" /> {{lbl.receive}}</label></div>
3940
</div>
4041
</div>
41-
<hr />
4242
<h4> {{lbl.securitySettings}}</h4>
4343
<div class="form-group">
4444
<div class="checkbox"><label><input type="checkbox" name="ckAllowRemoteFileDownloads" data-ng-model="settings.AllowServerToDownloadRemoteFiles" /> {{lbl.allowRemoteFileDownloads}}</label></div>
@@ -53,8 +53,7 @@ <h4> {{lbl.securitySettings}}</h4>
5353
<input type="text" class=" form-control" id="txtRemoteMaxFileSize" name="txtRemoteMaxFileSize" data-ng-model="settings.RemoteMaxFileSize" />
5454
</div>
5555
</div>
56-
<hr />
57-
<h4>{{lbl.tools}}</h4><br />
56+
<h4>{{lbl.tools}}</h4>
5857
<div class="form-group">
5958
<p>{{lbl.selectSavedBlogMlFle}}</p>
6059
<button class="btn btn-default btn-input-file next">{{lbl.import}}</button>

‎BlogEngine/BlogEngine.NET/admin/app/settings/basicView.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h2 class="page-title pull-left">{{lbl.basic}}</h2>
55
<button data-ng-click="save()" class="btn btn-success btn-sm btn-hasicon pull-left" type="button"><i class="fa fa-check"></i>{{lbl.save}}</button>
66
</div>
77
<div class="content-inner">
8-
<div class="form-width-limited">
8+
<div class="form-content">
99
<div class="form-group">
1010
<label for="txtName">Blog Title</label>
1111
<input type="text" class="form-control" id="txtName" name="txtName" data-ng-model="settings.Name" />

‎BlogEngine/BlogEngine.NET/admin/app/settings/commentView.html

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h2 class="page-title pull-left">{{lbl.comments}}</h2>
55
<button data-ng-click="save()" class="btn btn-success btn-hasicon btn-sm pull-left" type="button"><i class="fa fa-check"></i>{{lbl.save}}</button>
66
</div>
77
<div class="content-inner">
8-
<div class="form-width-limited">
8+
<div class="form-content">
99
<div class="form-group">
1010
<h4>Comments provider</h4>
1111
<div class="row">
@@ -14,9 +14,8 @@ <h4>Comments provider</h4>
1414
<div class="col-md-4"><div class="radio"><label><input type="radio" value="2" data-ng-model="settings.CommentProvider" ng-change="selectProvider('fb')" /> Facebook</label></div></div>
1515
</div>
1616
</div>
17-
<hr />
1817
<div id="be-provider">
19-
<h4>BlogEngine</h4>
18+
<h4>BlogEngine Comment</h4>
2019
<div class="checkbox"><label><input type="checkbox" name="ckIsCommentsEnabled" ng-model="settings.IsCommentsEnabled" ng-disabled="settings.CommentProvider > 0" /> {{lbl.enableComments}}</label></div>
2120
<div class="checkbox"><label><input type="checkbox" name="ckEnableCommentsModeration" ng-model="settings.EnableCommentsModeration" ng-disabled="settings.IsCommentsEnabled == false || settings.CommentProvider > 0" /> {{lbl.enableCommentsModeration}}</label></div>
2221
<div class="checkbox"><label><input type="checkbox" ng-model="settings.TrustAuthenticatedUsers" ng-disabled="settings.IsCommentsEnabled == false || settings.CommentProvider > 0" /> {{lbl.trustAuthenticated}}</label></div>
@@ -29,7 +28,7 @@ <h4>BlogEngine</h4>
2928
</div>
3029
</div>
3130
<div id="dq-provider">
32-
<h4>Disqus</h4>
31+
<h4>Disqus Comment</h4>
3332
<div class="form-group">
3433
<div class="alert alert-info" data-ng-bind-html="lbl.disqusSignupMessage"></div>
3534
<div class="form-group">
@@ -41,7 +40,7 @@ <h4>Disqus</h4>
4140
</div>
4241
</div>
4342
<div id="fb-provider">
44-
<h4>Facebook</h4>
43+
<h4>Facebook Comment</h4>
4544
<div class="form-group">
4645
<label>Facebook App Id</label>
4746
<input type="text" class="form-control ltr-dir" id="txtFacebookAppId" data-ng-model="settings.FacebookAppId" />
@@ -51,7 +50,6 @@ <h4>Facebook</h4>
5150
<select id="selFacebookLang" class="form-control" data-ng-options="o.OptionName for o in vm.FacebookLanguages" data-ng-model="selFacebookLanguage"></select>
5251
</div>
5352
</div>
54-
<hr />
5553
<h4>{{lbl.avatars}}</h4>
5654
<div class="row">
5755
<div class="col-md-6">

‎BlogEngine/BlogEngine.NET/admin/app/settings/controlView.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h2 class="page-title pull-left">{{lbl.controls}}</h2>
55
<button data-ng-click="save()" class="btn btn-success btn-sm btn-hasicon pull-left" type="button"><i class="fa fa-check"></i>{{lbl.save}}</button>
66
</div>
77
<div class="content-inner">
8-
<div class="form-width-limited">
8+
<div class="form-content">
99
<h4>{{lbl.contactForm}}</h4>
1010
<div class="form-group">
1111
<label for="txtContactFormMessage">{{lbl.formMessage}}</label>
@@ -29,7 +29,6 @@ <h4>{{lbl.contactForm}}</h4>
2929
</div>
3030
</div>
3131
</div>
32-
<hr />
3332
<h4>{{lbl.errorPage}}</h4>
3433
<div class="form-group">
3534
<label for="txtErrorTitle">{{lbl.txtErrorTitle}}</label>
@@ -39,7 +38,6 @@ <h4>{{lbl.errorPage}}</h4>
3938
<label for="txtErrorText">{{lbl.txtErrorText}}</label>
4039
<textarea class="form-control ltr-dir" rows="3" id="txtErrorText" data-ng-model="settings.ErrorText"></textarea>
4140
</div>
42-
<hr />
4341
<h4>{{lbl.customCode}}</h4>
4442
<div class="form-group">
4543
<label for="txtHtmlHeader">{{lbl.addCustomCodeToHeader}}</label>

‎BlogEngine/BlogEngine.NET/admin/app/settings/emailView.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h2 class="page-title pull-left">{{lbl.email}}</h2>
66
<button data-ng-click="testEmail()" class="btn btn-primary btn-hasicon btn-sm pull-left" type="button"><i class="fa fa-envelope-o"></i>{{lbl.testEmailSettings}}</button>
77
</div>
88
<div class="content-inner">
9-
<div class="form-width-limited">
9+
<div class="form-content">
1010
<div class="form-group">
1111
<label for="txtEmail">{{lbl.emailAddress}}</label>
1212
<input type="text" class="form-control ltr-dir" id="txtEmail" name="txtEmail" data-ng-model="settings.Email" />

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy