周伟鹏 / cnlive_shenhe · Commits

Commit 04a5730c9315d59807be50ab337477e9e7936282

Authored by 王言钊
1 parent a5e061f5

修复评论、SP白名单模块并测试

Inline Side-by-side
Showing 5 changed files with 200 additions and 180 deletions
src/main/java/com/cnlive/shenhe/dto/CommentsDTO.java
  View file @04a5730
... ... @@ -41,7 +41,7 @@ public class CommentsDTO extends ShyComments implements Serializable {
41 41 }
42 42  
43 43 public Integer getPage() {
44   - return page == null ? 1 : page;
  44 + return page;
45 45 }
46 46  
47 47 public void setPage(Integer page) {
... ... @@ -49,7 +49,7 @@ public class CommentsDTO extends ShyComments implements Serializable {
49 49 }
50 50  
51 51 public Integer getPageSize() {
52   - return pageSize == null ? 10 : pageSize;
  52 + return pageSize;
53 53 }
54 54  
55 55 public void setPageSize(Integer pageSize) {
... ...
src/main/java/com/cnlive/shenhe/dto/SitesDTO.java
  View file @04a5730
... ... @@ -44,7 +44,7 @@ public class SitesDTO extends ShySites implements Serializable {
44 44 }
45 45  
46 46 public Integer getPage() {
47   - return page == null ? 1 : page;
  47 + return page;
48 48 }
49 49  
50 50 public void setPage(Integer page) {
... ... @@ -52,7 +52,7 @@ public class SitesDTO extends ShySites implements Serializable {
52 52 }
53 53  
54 54 public Integer getPageSize() {
55   - return pageSize == null ? 10 : pageSize;
  55 + return pageSize;
56 56 }
57 57  
58 58 public void setPageSize(Integer pageSize) {
... ...
src/main/resources/templates/common/frame.html
  View file @04a5730
... ... @@ -81,7 +81,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em"
81 81 <li class="active"><a href="/videos/page?state=0&receive=0" id="/videos/page">点播审核</a></li>
82 82 <li><a href="/audio/page?state=0&receive=0&page=1&pageSize=10" id="/audio/page"> 音频审核</a></li>
83 83 <li><a href="/live/page?shenhe_state=0" id="/live/page"> 直播审核</a></li>
84   - <li><a href="/comments/page?state=0&receive=0" id="/comments/page"> 评论审核</a></li>
  84 + <li><a href="/comments/page?state=0&receive=0&page=1&pageSize=10" id="/comments/page"> 评论审核</a></li>
85 85 <li><a href="/content/page?receive_status=0" id="/content/page"> 图文审核</a></li>
86 86 <li><a href="/topic/page?shenhe_status=0&receive=0" id="/topic/page"> 话题审核</a></li>
87 87 <li><a href="/channel/page?shenhe_status=0&receive=0&page=1&pageSize=10" id="/channel/page"> 频道审核</a></li>
... ... @@ -94,7 +94,7 @@ line-height: 2em; margin: 0 auto;font-size: 2em&quot;
94 94 </a>
95 95 <ul class="treeview-menu">
96 96 <li><a href="/users/page" id="/users/page"> 审核云用户管理</a></li>
97   - <li><a href="/sites/page" id="/sites/page"> SP白名单管理</a></li>
  97 + <li><a href="/sites/page?page=1&pageSize=10" id="/sites/page"> SP白名单管理</a></li>
98 98 <li><a href="/email/page" id="/email/page"> 邮件消息管理</a></li>
99 99 <li><a href="/usersFree/page" id="/usersFree/page"> 网++白名单管理</a></li>
100 100 <li><a href="/notSpeak/page" id="/notSpeak/page"> 网++禁言管理</a></li>
... ...
src/main/resources/templates/page/comment.html
  View file @04a5730
... ... @@ -568,7 +568,7 @@
568 568 if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
569 569 }
570 570 h = h.substring(1, h.length);
571   - window.location.href = "/comments/page?" + h + "&pageSize=" + pageSize;
  571 + window.location.href = "/comments/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
572 572 } else {
573 573 var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
574 574 var split = se.split("&");
... ... @@ -578,7 +578,7 @@
578 578 if (s.indexOf("page=") < 0) h = h + "&" + split[i];
579 579 }
580 580 h = h.substring(1, h.length);
581   - window.location.href = "/comments/page?" + h + "&pageSize=" + pageSize;
  581 + window.location.href = "/comments/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
582 582 }
583 583 }
584 584  
... ... @@ -620,7 +620,7 @@
620 620 type = $("#topic").val();
621 621 comment_user_id = $("#comment_user_id").val();
622 622 var expand_list_state = $("#forms").attr("expand_list_state");
623   - window.location.href = "/comments/page?activity_id=" + activity_id + "&start_date=" + start_date + "&end_date=" + end_date + "&content=" + content + "&pageSize=" + count + "&state=" + state + "&receive=" + receive + "&type=" + type + "&comment_user_id=" + comment_user_id + "&expand_list_state=" + expand_list_state;
  623 + window.location.href = "/comments/page?activity_id=" + activity_id + "&start_date=" + start_date + "&end_date=" + end_date + "&content=" + content + "&page=" + 1 + "&pageSize=" + count + "&state=" + state + "&receive=" + receive + "&type=" + type + "&comment_user_id=" + comment_user_id + "&expand_list_state=" + expand_list_state;
624 624 }
625 625  
626 626 //全部
... ...
src/main/resources/templates/page/site.html
  View file @04a5730
... ... @@ -3,8 +3,13 @@
3 3  
4 4 <head th:replace="../templates/common/head::head"></head>
5 5 <style>
6   - .fixed-table-toolbar .bs-bars, .fixed-table-toolbar .columns, .fixed-table-toolbar .search{margin-top: 0px;}
7   - .table{margin-bottom:0;}
  6 + .fixed-table-toolbar .bs-bars, .fixed-table-toolbar .columns, .fixed-table-toolbar .search {
  7 + margin-top: 0px;
  8 + }
  9 +
  10 + .table {
  11 + margin-bottom: 0;
  12 + }
8 13  
9 14 </style>
10 15 <body class="skin-blue sidebar-mini">
... ... @@ -36,107 +41,120 @@
36 41 </div>
37 42 </div>
38 43 <div class="columns columns-right btn-group pull-right">
39   - <button class="btn btn-default" type="button" name="refresh" title="搜索" id="site_query">搜索</button>
40   - <ul class="dropdown-menu" role="menu">
41   - <li><label><input type="checkbox" data-field="sp_id" value="0"
42   - checked="checked"> spID</label></li>
43   - <li><label><input type="checkbox" data-field="sp_id_brief" value="1"
44   - checked="checked"> sp简称</label></li>
45   - <li><label><input type="checkbox" data-field="type" value="2"
46   - checked="checked"> 免审业务
47   - </label></li>
48   - <li><label><input type="checkbox" data-field="service_time" value="3"
49   - checked="checked"> 免审业务更新时间</label></li>
50   - <li><label><input type="checkbox" data-field="upload_time" value="4"
51   - checked="checked"> sp信息创建时间
52   - </label></li>
53   - <li><label><input type="checkbox" data-field="updated_at" value="5"
54   - checked="checked"> sp信息更新时间</label></li>
55   - <li><label><input type="checkbox" data-field="action" value="6"
56   - checked="checked"> 操作
57   - </label></li>
58   - </ul>
59   - </div>
60   - </div>
61   - <div class="pull-right search">
62   - <form id="searchForm">
63   - <input class="form-control" type="text" placeholder="搜索" id="keyword" name="keyword" th:value="${param.keyword}">
64   - </form>
  44 + <button class="btn btn-default" type="button" name="refresh" title="搜索"
  45 + id="site_query">搜索
  46 + </button>
  47 + <ul class="dropdown-menu" role="menu">
  48 + <li><label><input type="checkbox" data-field="sp_id" value="0"
  49 + checked="checked"> spID</label></li>
  50 + <li><label><input type="checkbox" data-field="sp_id_brief" value="1"
  51 + checked="checked"> sp简称</label></li>
  52 + <li><label><input type="checkbox" data-field="type" value="2"
  53 + checked="checked"> 免审业务
  54 + </label></li>
  55 + <li><label><input type="checkbox" data-field="service_time" value="3"
  56 + checked="checked"> 免审业务更新时间</label></li>
  57 + <li><label><input type="checkbox" data-field="upload_time" value="4"
  58 + checked="checked"> sp信息创建时间
  59 + </label></li>
  60 + <li><label><input type="checkbox" data-field="updated_at" value="5"
  61 + checked="checked"> sp信息更新时间</label></li>
  62 + <li><label><input type="checkbox" data-field="action" value="6"
  63 + checked="checked"> 操作
  64 + </label></li>
  65 + </ul>
65 66 </div>
66 67 </div>
67   - <div class="fixed-table-container" style="padding-bottom: 0px;">
68   - <div class="fixed-table-body">
69   - <table data-toggle="table" data-pagination="true"
70   - data-search="false" data-show-refresh="true" data-show-toggle="true"
71   - data-show-columns="true" data-toolbar="#toolbar"
72   - class="table table-hover">
73   - <thead>
74   - <tr>
75   - <th style="text-align: center; width: 50px; " data-field="sp_id"
76   - tabindex="0">
77   - <div class="th-inner ">spID</div>
78   - <div class="fht-cell"></div>
79   - </th>
80   - <th style="text-align: center; width: 120px; " data-field="sp_id_brief"
81   - tabindex="0">
82   - <div class="th-inner ">sp简称</div>
83   - <div class="fht-cell"></div>
84   - </th>
85   - <th style="text-align: center; width: 200px; " data-field="type"
86   - tabindex="0">
87   - <div class="th-inner ">免审业务
88   - </div>
89   - <div class="fht-cell"></div>
90   - </th>
91   - <th style="text-align: center; width: 120px; " data-field="upload_time"
92   - tabindex="0">
93   - <div class="th-inner ">sp信息创建时间
94   - </div>
95   - <div class="fht-cell"></div>
96   - </th>
97   - <th style="text-align: center; width: 120px; " data-field="updated_at"
98   - tabindex="0">
99   - <div class="th-inner ">sp信息更新时间</div>
100   - <div class="fht-cell"></div>
101   - </th>
102   - <th style="text-align: center; width: 100px; " data-field="action"
103   - tabindex="0">
104   - <div class="th-inner ">操作
105   - </div>
106   - <div class="fht-cell"></div>
107   - </th>
108   - </tr>
109   - </thead>
110   - <tbody>
111   - <tr th:data-index="${siteStat.index}" th:each="site : ${sitePage.list}">
112   - <td style="text-align: center; width: 50px;" th:text="${site.spid}">82</td>
113   - <td style="text-align: center; width: 120px;" th:text="${site.name}">视讯中国</td>
114   - <td style="text-align: center; width: 200px;" th:text="${site.write_business_name}">点播审核</td>
115   - <td style="text-align: center; width: 120px;" th:text="${#dates.format(site.created_at, 'yyyy-MM-dd HH:mm:ss')}">2018-11-22 23:08:48</td>
116   - <td style="text-align: center; width: 120px;" th:text="${#dates.format(site.updated_at, 'yyyy-MM-dd HH:mm:ss')}">2016-08-03 14:27:17</td>
117   - <td style="text-align: center; width: 100px;"><span>&nbsp;</span><a
118   - class="edit" th:href="'javascript:edit('+${site.id}+',\''+${site.name}+'\',\''+${site.write_business} +'\')'">
119   - <button class="btn btn-primary btn-xs">设置</button>
120   - </a><span> </span><span>&nbsp;</span></td>
121   - </tr>
  68 + <div class="pull-right search">
  69 + <form id="searchForm">
  70 + <input class="form-control" type="text" placeholder="搜索" id="keyword"
  71 + name="keyword" th:value="${param.keyword}">
  72 + </form>
  73 + </div>
  74 + </div>
  75 + <div class="fixed-table-container" style="padding-bottom: 0px;">
  76 + <div class="fixed-table-body">
  77 + <table data-toggle="table" data-pagination="true"
  78 + data-search="false" data-show-refresh="true" data-show-toggle="true"
  79 + data-show-columns="true" data-toolbar="#toolbar"
  80 + class="table table-hover">
  81 + <thead>
  82 + <tr>
  83 + <th style="text-align: center; width: 50px; " data-field="sp_id"
  84 + tabindex="0">
  85 + <div class="th-inner ">spID</div>
  86 + <div class="fht-cell"></div>
  87 + </th>
  88 + <th style="text-align: center; width: 120px; " data-field="sp_id_brief"
  89 + tabindex="0">
  90 + <div class="th-inner ">sp简称</div>
  91 + <div class="fht-cell"></div>
  92 + </th>
  93 + <th style="text-align: center; width: 200px; " data-field="type"
  94 + tabindex="0">
  95 + <div class="th-inner ">免审业务
  96 + </div>
  97 + <div class="fht-cell"></div>
  98 + </th>
  99 + <th style="text-align: center; width: 120px; " data-field="upload_time"
  100 + tabindex="0">
  101 + <div class="th-inner ">sp信息创建时间
  102 + </div>
  103 + <div class="fht-cell"></div>
  104 + </th>
  105 + <th style="text-align: center; width: 120px; " data-field="updated_at"
  106 + tabindex="0">
  107 + <div class="th-inner ">sp信息更新时间</div>
  108 + <div class="fht-cell"></div>
  109 + </th>
  110 + <th style="text-align: center; width: 100px; " data-field="action"
  111 + tabindex="0">
  112 + <div class="th-inner ">操作
  113 + </div>
  114 + <div class="fht-cell"></div>
  115 + </th>
  116 + </tr>
  117 + </thead>
  118 + <tbody>
  119 + <tr th:data-index="${siteStat.index}" th:each="site : ${sitePage.list}">
  120 + <td style="text-align: center; width: 50px;" th:text="${site.spid}">82</td>
  121 + <td style="text-align: center; width: 120px;" th:text="${site.name}">视讯中国
  122 + </td>
  123 + <td style="text-align: center; width: 200px;"
  124 + th:text="${site.write_business_name}">点播审核
  125 + </td>
  126 + <td style="text-align: center; width: 120px;"
  127 + th:text="${#dates.format(site.created_at, 'yyyy-MM-dd HH:mm:ss')}">
  128 + 2018-11-22 23:08:48
  129 + </td>
  130 + <td style="text-align: center; width: 120px;"
  131 + th:text="${#dates.format(site.updated_at, 'yyyy-MM-dd HH:mm:ss')}">
  132 + 2016-08-03 14:27:17
  133 + </td>
  134 + <td style="text-align: center; width: 100px;"><span>&nbsp;</span><a
  135 + class="edit"
  136 + th:href="'javascript:edit('+${site.id}+',\''+${site.name}+'\',\''+${site.write_business} +'\')'">
  137 + <button class="btn btn-primary btn-xs">设置</button>
  138 + </a><span> </span><span>&nbsp;</span></td>
  139 + </tr>
122 140  
123   - </tbody>
124   - </table>
125   - </div>
  141 + </tbody>
  142 + </table>
  143 + </div>
126 144  
127   - <div class="fixed-table-pagination" style="display: block;">
128   - <div class="pull-left pagination-detail">
129   - <span class="pagination-info" th:text="'共 '+${sitePage.total}+' 条记录，每页显示'">共 0 条记录</span>
  145 + <div class="fixed-table-pagination" style="display: block;">
  146 + <div class="pull-left pagination-detail">
  147 + <span class="pagination-info" th:text="'共 '+${sitePage.total}+' 条记录，每页显示'">共 0 条记录</span>
130 148 <select class="" id="pageSize" name="pageSize" onchange="selectPageSize()">
131   - <option value="10" th:selected="${pageSize==10}">10</option>
132   - <option value="20" th:selected="${pageSize==20}">20</option>
133   - <option value="50" th:selected="${pageSize==50}">50</option>
134   - <option value="100" th:selected="${pageSize==100}">100</option>
  149 + <option value="10" th:selected="${pageSize==10}">10</option>
  150 + <option value="20" th:selected="${pageSize==20}">20</option>
  151 + <option value="50" th:selected="${pageSize==50}">50</option>
  152 + <option value="100" th:selected="${pageSize==100}">100</option>
135 153 </select>
136   - <span class="pagination-info" >条记录</span>
137   - </div>
138   - <div class="pull-right pagination">
139   - <ul class="pagination" th:if="${sitePage.pages>1}">
  154 + <span class="pagination-info">条记录</span>
  155 + </div>
  156 + <div class="pull-right pagination">
  157 + <ul class="pagination" th:if="${sitePage.pages>1}">
140 158 <li class="page-pre"><a th:href="'javascript:fanye(1);'">‹‹</a></li>
141 159 <li class="page-pre" th:if="${!sitePage.isFirstPage}"><a
142 160 th:onclick="'javascript:fanye(\''+${sitePage.pageNum-1}+'\');'">‹</a>
... ... @@ -170,17 +188,17 @@
170 188 th:onclick="'javascript:fanye(\''+${sitePage.pages}+'\');'">››</a>
171 189 </li>
172 190 </ul>
173   - </div>
174 191 </div>
175 192 </div>
176 193 </div>
177   - <div class="clearfix"></div>
178 194 </div>
  195 + <div class="clearfix"></div>
179 196 </div>
180 197 </div>
181 198 </div>
182   - </section>
183 199 </div>
  200 + </section>
  201 +</div>
184 202  
185 203 <!-- 模态框（Modal） -->
186 204 <div class="modal fade" id="editModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
... ... @@ -206,7 +224,8 @@
206 224 <div class="col-sm-10" style="float: left">
207 225 <div th:each="bu:${business}" style="padding-right: 30px;" class="write_check">
208 226 <span th:text="${bu.value}" style="font-size: 15px"></span>
209   - <input type="checkbox" name="write_business" th:value="${bu.key}" th:id="'write_check_'+${bu.key}">
  227 + <input type="checkbox" name="write_business" th:value="${bu.key}"
  228 + th:id="'write_check_'+${bu.key}">
210 229 </div>
211 230 </div>
212 231 </form>
... ... @@ -215,89 +234,90 @@
215 234 </div>
216 235 <div class="modal-footer">
217 236 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
218   - <button type="button" class="btn btn-primary" onclick="javascript:$('#editWrite').submit();">提交更改</button>
  237 + <button type="button" class="btn btn-primary" onclick="javascript:$('#editWrite').submit();">提交更改
  238 + </button>
219 239 </div>
220 240 </div><!-- /.modal-content -->
221 241 </div><!-- /.modal-dialog -->
222 242 </div>
223 243 <!-- /.modal -->
224   - <script>
225   - //设置白名单，打开编辑窗口
226   - function edit(id,company,write_business){
227   - $("#edit_company").text(company);
228   - $("#edit_id").val(id);
229   - $("#redirect_url").val(location.pathname+location.search);
230   - $(".write_check input").prop("checked",false);
231   - if($.trim(write_business)!=''){
232   - var array = write_business.split(",")
233   - for (var i=0;i<array.length;i++){
234   - $("#write_check_"+array[i]).prop("checked",true);
235   - }
236   - }
237   - $('#editModal').modal('show');
  244 +<script>
  245 + //设置白名单，打开编辑窗口
  246 + function edit(id, company, write_business) {
  247 + $("#edit_company").text(company);
  248 + $("#edit_id").val(id);
  249 + $("#redirect_url").val(location.pathname + location.search);
  250 + $(".write_check input").prop("checked", false);
  251 + if ($.trim(write_business) != '') {
  252 + var array = write_business.split(",")
  253 + for (var i = 0; i < array.length; i++) {
  254 + $("#write_check_" + array[i]).prop("checked", true);
  255 + }
238 256 }
239   -
240   - //翻页函数
241   - function fanye(page) {
242   - var param = location.search;
243   - if (param.indexOf("page=") != -1) {
244   - var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
245   - var split = se.split("&");
246   - var h = "";
247   - for (var i = 0; i < split.length; i++) {
248   - var s = split[i];
249   - if (s.indexOf("page=") < 0) h = h + "&" + split[i];
250   - }
251   - h = h.substring(1, h.length);
252   - window.location.href = "/sites/page?" + h + "&page=" + page;
253   - } else {
254   - param = param.substring(1, param.length);
255   - window.location.href = "/sites/page?" + param + "&page=" + page;
  257 + $('#editModal').modal('show');
  258 + }
  259 +
  260 + //翻页函数
  261 + function fanye(page) {
  262 + var param = location.search;
  263 + if (param.indexOf("page=") != -1) {
  264 + var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
  265 + var split = se.split("&");
  266 + var h = "";
  267 + for (var i = 0; i < split.length; i++) {
  268 + var s = split[i];
  269 + if (s.indexOf("page=") < 0) h = h + "&" + split[i];
256 270 }
  271 + h = h.substring(1, h.length);
  272 + window.location.href = "/sites/page?" + h + "&page=" + page;
  273 + } else {
  274 + param = param.substring(1, param.length);
  275 + window.location.href = "/sites/page?" + param + "&page=" + page;
257 276 }
258   -
259   - //选择每页数量触发函数
260   - function selectPageSize(){
261   - var pageSize=$("#pageSize").val();
262   - var param = location.search;
263   - if (param.indexOf("pageSize=") != -1) {
264   - var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
265   - var split = se.split("&");
266   - var h = "";
267   - for (var i = 0; i < split.length; i++) {
268   - var s = split[i];
269   - if (s.indexOf("pageSize=") < 0 &&s.indexOf("page=") < 0) h = h + "&" + split[i];
270   - }
271   - h = h.substring(1, h.length);
272   - window.location.href = "/sites/page?" + h + "&pageSize=" + pageSize;
273   - } else {
274   - var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
275   - var split = se.split("&");
276   - var h = "";
277   - for (var i = 0; i < split.length; i++) {
278   - var s = split[i];
279   - if (s.indexOf("page=") < 0) h = h + "&" + split[i];
280   - }
281   - h = h.substring(1, h.length);
282   - window.location.href = "/sites/page?" + h + "&pageSize=" + pageSize;
283   - }
  277 + }
  278 +
  279 + //选择每页数量触发函数
  280 + function selectPageSize() {
  281 + var pageSize = $("#pageSize").val();
  282 + var param = location.search;
  283 + if (param.indexOf("pageSize=") != -1) {
  284 + var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
  285 + var split = se.split("&");
  286 + var h = "";
  287 + for (var i = 0; i < split.length; i++) {
  288 + var s = split[i];
  289 + if (s.indexOf("pageSize=") < 0 && s.indexOf("page=") < 0) h = h + "&" + split[i];
  290 + }
  291 + h = h.substring(1, h.length);
  292 + window.location.href = "/sites/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
  293 + } else {
  294 + var se = param.replace("?", "");//去掉问号，防止问号和要去掉的参数相连
  295 + var split = se.split("&");
  296 + var h = "";
  297 + for (var i = 0; i < split.length; i++) {
  298 + var s = split[i];
  299 + if (s.indexOf("page=") < 0) h = h + "&" + split[i];
  300 + }
  301 + h = h.substring(1, h.length);
  302 + window.location.href = "/sites/page?" + h + "&page=" + 1 + "&pageSize=" + pageSize;
284 303 }
285   -
286   - //搜索
287   - $('#site_query').click(function () {
288   - var keyword = $("#keyword").val();
289   - var pageSize = $("#pageSize").val();
290   - window.location.href = "/sites/page?keyword=" + keyword + "&pageSize=" + pageSize;
291   - });
  304 + }
292 305  
293   - </script>
  306 + //搜索
  307 + $('#site_query').click(function () {
  308 + var keyword = $("#keyword").val();
  309 + var pageSize = $("#pageSize").val();
  310 + window.location.href = "/sites/page?keyword=" + keyword + "&page=" + 1 + "&pageSize=" + pageSize;
  311 + });
  312 +
  313 +</script>
294 314  
295   - <footer th:replace="../templates/common/foot::foot" ></footer>
  315 +<footer th:replace="../templates/common/foot::foot"></footer>
296 316  
297 317  
298   - <!-- Add the sidebar's background. This div must be placed
299   - immediately after the control sidebar -->
300   - <div class="control-sidebar-bg" style="position: fixed; height: auto;"></div>
  318 +<!-- Add the sidebar's background. This div must be placed
  319 + immediately after the control sidebar -->
  320 +<div class="control-sidebar-bg" style="position: fixed; height: auto;"></div>
301 321  
302 322 </div><!-- ./wrapper -->
303 323  
... ...