Skip to content

Commit e03fef6

Browse files
byfarzinbyfarzin
committed
RTL direction implemented. Responsive improved. some issues fixed.
1 parent 4128877 commit e03fef6

32 files changed

+972
-133
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -705,6 +705,7 @@
705705
<Content Include="admin\themes\standard\sass\modules\_alerts.scss" />
706706
<Content Include="admin\themes\standard\sass\modules\_pagination.scss" />
707707
<Content Include="admin\themes\standard\sass\modules\_dropdown.scss" />
708+
<Content Include="admin\themes\standard\sass\layout\_rtl.scss" />
708709
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
709710
<Content Include="Scripts\i18n\angular-locale_aa-dj.js" />
710711
<Content Include="Scripts\i18n\angular-locale_aa-er.js" />

‎BlogEngine/BlogEngine.NET/admin/app/content/comments/commentView.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ <h4 class="modal-title">{{vm.Detail.Title}}</h4>
99
</div>
1010
<div class="modal-body">
1111
<div class="form-horizontal">
12-
<div class="form-group"><span class="col-md-3">{{lbl.author}}</span><div class="col-md-9"><span>{{vm.SelectedItem.Author}}</span></div></div>
13-
<div class="form-group"><span class="col-md-3">{{lbl.email}}</span> <div class="col-md-9"><span>{{vm.SelectedItem.Email}}</span></div></div>
14-
<div class="form-group"><span class="col-md-3">{{lbl.date}}</span> <div class="col-md-9"><span>{{vm.SelectedItem.DateCreated}}</span></div></div>
12+
<div class="form-group"><span class="col-xs-3">{{lbl.author}}</span><div class="col-xs-9"><span>{{vm.SelectedItem.Author}}</span></div></div>
13+
<div class="form-group"><span class="col-xs-3">{{lbl.email}}</span> <div class="col-xs-9"><span>{{vm.SelectedItem.Email}}</span></div></div>
14+
<div class="form-group"><span class="col-xs-3">{{lbl.date}}</span> <div class="col-xs-9"><span>{{vm.SelectedItem.DateCreated}}</span></div></div>
1515
</div>
1616
<div class="comment-view-reply">
1717
<pre class="comment-view-box">{{vm.Detail.Content}}</pre>

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

Lines changed: 57 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -33,69 +33,71 @@
3333
</script>
3434
<script type="text/javascript" src="admin.res.axd"></script>
3535
</head>
36-
<body class="filemanager @Resources.labels.LangDirection" ng-controller="FileManagerController">
37-
@Scripts.Render("~/scripts/wysiwyg")
38-
<form id="form" action="" class="file-form">
39-
<div id="modal-form" class="modal fade">
40-
<div class="modal-dialog">
41-
<div class="modal-content">
42-
<div class="modal-header">
43-
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="focusInput=false"><i class="fa fa-times"></i></button>
44-
<h4 class="modal-title">{{lbl.addFolder}}</h4>
45-
</div>
46-
<div class="modal-body">
47-
<div class="form-group">
48-
<label for="txtFolder">{{lbl.title}}</label>
49-
<input type="text" class="form-control" id="txtFolder" name="txtFolder" data-ng-model="dirName" focus-me="focusInput" />
36+
<body class=" @Resources.labels.LangDirection-dir" ng-controller="FileManagerController">
37+
<div class="filemanager">
38+
@Scripts.Render("~/scripts/wysiwyg")
39+
<form id="form" action="" class="file-form">
40+
<div id="modal-form" class="modal fade">
41+
<div class="modal-dialog">
42+
<div class="modal-content">
43+
<div class="modal-header">
44+
<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="focusInput=false"><i class="fa fa-times"></i></button>
45+
<h4 class="modal-title">{{lbl.addFolder}}</h4>
5046
</div>
51-
<div class="modal-buttons">
52-
<button type="button" ng-click="createFolder()" class="btn btn-success btn-hasicon"><i class="fa fa-check"></i>{{lbl.save}}</button>
53-
<button type="button" class="btn btn-default" data-dismiss="modal" ng-click="focusInput=false">{{lbl.cancel}}</button>
47+
<div class="modal-body">
48+
<div class="form-group">
49+
<label for="txtFolder">{{lbl.title}}</label>
50+
<input type="text" class="form-control" id="txtFolder" name="txtFolder" data-ng-model="dirName" focus-me="focusInput" />
51+
</div>
52+
<div class="modal-buttons">
53+
<button type="button" ng-click="createFolder()" class="btn btn-success btn-hasicon"><i class="fa fa-check"></i>{{lbl.save}}</button>
54+
<button type="button" class="btn btn-default" data-dismiss="modal" ng-click="focusInput=false">{{lbl.cancel}}</button>
55+
</div>
5456
</div>
5557
</div>
5658
</div>
5759
</div>
58-
</div>
59-
<div class="main-header clearfix">
60-
<input type="file" id="file" name="file" class="pull-left input-file-hidden" tabindex="-1" onchange="angular.element(this).scope().uploadFile(this.files)" />
61-
<button type="button" class="pull-left btn btn-success btn-sm btn-hasicon btn-input-file prev"><i class="fa fa-plus"></i>{{lbl.upload}}</button>
62-
<a ng-click="addFolder()" class="pull-left btn btn-sm btn-success btn-hasicon"><i class="fa fa-folder"></i>{{lbl.theNew}} Folder</a>
63-
<a ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" class="pull-left btn btn-sm btn-danger btn-icon" angular-tooltip tooltip="lbl.doDelete"><i class="fa fa-trash"></i></a>
64-
<span id="file-spinner" style="padding-left: 10px; position: relative; top: 5px"><i class="fa fa-spinner fa-spin"></i></span>
65-
<input type="text" data-ng-model="query" data-ng-change="search()" class="input-sm form-control search-form pull-right" placeholder="{{lbl.search}}..." />
66-
</div>
67-
<div class="filemanager-content">
68-
<div class="filemanager-path">{{currentPath}}</div>
69-
<div class="filemanager-list clearfix">
70-
<div class="item-file" ng-repeat="item in pagedItems[currentPage] | orderBy:sortingOrder">
71-
<div class="item-file-image">
72-
<a ng-if="item.FileType === 0 && item.Name != '...'" title="{{item.Name}}" href="" ng-click="load(item.FullPath)">
73-
<i class="fa fa-folder"></i>
74-
</a>
75-
<a ng-if="item.FileType === 0 && item.Name === '...'" title="{{item.Name}}" href="" ng-click="load(item.FullPath)">
76-
<i class="fa fa-arrow-left"></i>
77-
</a>
78-
<a ng-if="item.FileType === 1" title="{{item.Name}}" href="" ng-click="insertFile(item)">
79-
<i ng-class="item.ImgPlaceholder"></i>
80-
</a>
81-
<a ng-if="item.FileType === 2" title="{{item.Name}}" href="" ng-click="insertFile(item)">
82-
<img ng-src="@imgHandler{{item.FullPath}}" />
83-
</a>
84-
</div>
85-
<div class="item-file-name">
86-
<label><input ng-if="item.Name != '...'" type="checkbox" data-ng-model="item.IsChecked" /> <span class="text-ellipsis">{{item.Name.substring(0,12)}}</span></label>
60+
<div class="main-header clearfix">
61+
<input type="file" id="file" name="file" class="pull-left input-file-hidden" tabindex="-1" onchange="angular.element(this).scope().uploadFile(this.files)" />
62+
<button type="button" class="pull-left btn btn-success btn-sm btn-hasicon btn-input-file prev"><i class="fa fa-plus"></i>{{lbl.upload}}</button>
63+
<a ng-click="addFolder()" class="pull-left btn btn-sm btn-success btn-hasicon"><i class="fa fa-folder"></i>{{lbl.theNew}} Folder</a>
64+
<a ng-click="processChecked('delete')" ng-disabled="itemsChecked() === false" class="pull-left btn btn-sm btn-danger btn-icon" angular-tooltip tooltip="lbl.doDelete"><i class="fa fa-trash"></i></a>
65+
<span id="file-spinner" style="padding-left: 10px; position: relative; top: 5px"><i class="fa fa-spinner fa-spin"></i></span>
66+
<input type="text" data-ng-model="query" data-ng-change="search()" class="input-sm form-control search-form pull-right" placeholder="{{lbl.search}}..." />
67+
</div>
68+
<div class="filemanager-content">
69+
<div class="filemanager-path">{{currentPath}}</div>
70+
<div class="filemanager-list clearfix">
71+
<div class="item-file" ng-repeat="item in pagedItems[currentPage] | orderBy:sortingOrder">
72+
<div class="item-file-image">
73+
<a ng-if="item.FileType === 0 && item.Name != '...'" title="{{item.Name}}" href="" ng-click="load(item.FullPath)">
74+
<i class="fa fa-folder"></i>
75+
</a>
76+
<a ng-if="item.FileType === 0 && item.Name === '...'" title="{{item.Name}}" href="" ng-click="load(item.FullPath)">
77+
<i class="fa fa-arrow-left"></i>
78+
</a>
79+
<a ng-if="item.FileType === 1" title="{{item.Name}}" href="" ng-click="insertFile(item)">
80+
<i ng-class="item.ImgPlaceholder"></i>
81+
</a>
82+
<a ng-if="item.FileType === 2" title="{{item.Name}}" href="" ng-click="insertFile(item)">
83+
<img ng-src="@imgHandler{{item.FullPath}}" />
84+
</a>
85+
</div>
86+
<div class="item-file-name">
87+
<label><input ng-if="item.Name != '...'" type="checkbox" data-ng-model="item.IsChecked" /> <span class="text-ellipsis">{{item.Name.substring(0,12)}}</span></label>
88+
</div>
8789
</div>
8890
</div>
8991
</div>
90-
</div>
91-
<div ng-if="items.length > itemsPerPage" class="text-right pagination-wrapper" style="margin-top: 10px">
92-
<ul class="pagination pagination-sm">
93-
<li data-ng-class="{disabled: currentPage == 0}"><a data-ng-click="prevPage()">« {{lbl.prev}}</a></li>
94-
<li data-ng-repeat="n in range(pagedItems.length)" data-ng-class="{active: n == currentPage}" data-ng-click="setPage()"><a data-ng-bind="n + 1">1</a></li>
95-
<li data-ng-class="{disabled: currentPage == pagedItems.length - 1}"><a data-ng-click="nextPage()">{{lbl.next}} »</a></li>
96-
</ul>
97-
</div>
98-
</form>
92+
<div ng-if="items.length > itemsPerPage" class="text-right pagination-wrapper" style="margin-top: 10px">
93+
<ul class="pagination pagination-sm">
94+
<li data-ng-class="{disabled: currentPage == 0}"><a data-ng-click="prevPage()">« {{lbl.prev}}</a></li>
95+
<li data-ng-repeat="n in range(pagedItems.length)" data-ng-class="{active: n == currentPage}" data-ng-click="setPage()"><a data-ng-bind="n + 1">1</a></li>
96+
<li data-ng-class="{disabled: currentPage == pagedItems.length - 1}"><a data-ng-click="nextPage()">{{lbl.next}} »</a></li>
97+
</ul>
98+
</div>
99+
</form>
100+
</div>
99101
<script>
100102
// input file
101103
$(".btn-input-file.prev").click(function () {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ <h4>{{lbl.comments}}</h4>
2828
<div class="form-group">
2929
<label>{{lbl.enableTrackbacks}}</label>
3030
<div class="row">
31-
<div class="col-md-6"><label><input type="checkbox" name="ckEnablePingBackSend" data-ng-model="settings.EnablePingBackSend" /> {{lbl.send}}</label></div>
32-
<div class="col-md-6"> <label><input type="checkbox" name="ckEnablePingBackReceive" data-ng-model="settings.EnablePingBackReceive" /> {{lbl.receive}}</label> </div>
31+
<div class="col-md-6"><div class="checkbox"><label><input type="checkbox" name="ckEnablePingBackSend" data-ng-model="settings.EnablePingBackSend" /> {{lbl.send}}</label></div></div>
32+
<div class="col-md-6"><div class="checkbox"><label><input type="checkbox" name="ckEnablePingBackReceive" data-ng-model="settings.EnablePingBackReceive" /> {{lbl.receive}}</label></div></div>
3333
</div>
3434
</div>
3535
<div class="form-group">
3636
<label>{{lbl.enablePingbacks}}</label>
3737
<div class="row">
38-
<div class="col-md-6"><label><input type="checkbox" name="ckEnableTrackBackSend" data-ng-model="settings.EnableTrackBackSend" /> {{lbl.send}}</label></div>
39-
<div class="col-md-6"><label><input type="checkbox" name="ckEnableTrackBackReceive" data-ng-model="settings.EnableTrackBackReceive" /> {{lbl.receive}}</label></div>
38+
<div class="col-md-6"><div class="checkbox"><label><input type="checkbox" name="ckEnableTrackBackSend" data-ng-model="settings.EnableTrackBackSend" /> {{lbl.send}}</label></div></div>
39+
<div class="col-md-6"><div class="checkbox"><label><input type="checkbox" name="ckEnableTrackBackReceive" data-ng-model="settings.EnableTrackBackReceive" /> {{lbl.receive}}</label></div></div>
4040
</div>
4141
</div>
4242
<h4> {{lbl.securitySettings}}</h4>

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

Lines changed: 172 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/styles.css‎

Lines changed: 101 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BlogEngine/BlogEngine.NET/admin/themes/standard/css/styles.css.map‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎BlogEngine/BlogEngine.NET/admin/themes/standard/sass/base/_reset.scss‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,10 @@ h1, h2, h3, h4, h5, h6 {
3030
iframe {
3131
width: 100%;
3232
border: none;
33-
}
33+
}
34+
35+
button {
36+
&:focus {
37+
outline: none !important;
38+
}
39+
}

‎BlogEngine/BlogEngine.NET/admin/themes/standard/sass/base/_utilites.scss‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
// LTR - RTL
2-
.ltr-dir {
3-
direction: $dir-ltr;
4-
}
5-
.rtl-dir {
6-
direction: $dir-rtl;
7-
}
8-
9-
// main-loading
1+
// main-loading
102
.main-loading {
113
@include user-select(none);
124
@include border-radius(3px);

‎BlogEngine/BlogEngine.NET/admin/themes/standard/sass/base/_variables.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ $sidebar-global-height: 60px;
2020

2121
// fonts
2222
$font-family-roboto: "Roboto";
23-
$font-family-base: $font-family-roboto, "Helvetica Neue",Helvetica,Arial,sans-serif;
23+
$font-family-base: $font-family-roboto, "Helvetica Neue", Helvetica, Arial, sans-serif;
2424
$font-size-base: 14px;
2525
$line-height-base: 1.8;
2626

@@ -55,4 +55,4 @@ $btn-warning-border: $color-warning;
5555

5656
$btn-danger-color: #fff;
5757
$btn-danger-bg: $color-danger;
58-
$btn-danger-border: $color-danger;
58+
$btn-danger-border: $color-danger;

0 commit comments

Comments
 (0)