hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5470 from pichalite/acp-templates

Browse Source 
Fix ACP templates markup
v1.18.x
psychobunny 8 years ago committed by GitHub
parent 0de21cb3ff aea40902b0
commit ebe5ed7560
17 changed files with 275 additions and 254 deletions
Show Stats Download Patch File Download Diff File

2
public/less/admin/general/navigation.less
Unescape Escape View File

@ -1,6 +1,6 @@
#navigation { #navigation {
#active-navigation { #active-navigation {
width: 100%; float: none;
min-height: 50px; min-height: 50px;
border: 1px solid #eee; border: 1px solid #eee;
overflow: auto; overflow: auto;

2
src/views/admin/advanced/cache.tpl
Unescape Escape View File

@ -1,5 +1,5 @@
<div class="post-cache"> <div class="row post-cache">
<div class="col-lg-9"> <div class="col-lg-9">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-calendar-o"></i> [[admin/advanced/cache:post-cache]]</div> <div class="panel-heading"><i class="fa fa-calendar-o"></i> [[admin/advanced/cache:post-cache]]</div>

2
src/views/admin/advanced/database.tpl
Unescape Escape View File

@ -1,4 +1,4 @@
<div class="database"> <div class="row database">
<div class="col-sm-9"> <div class="col-sm-9">
<!-- IF mongo --> <!-- IF mongo -->
<div class="panel panel-default"> <div class="panel panel-default">

2
src/views/admin/advanced/events.tpl
Unescape Escape View File

@ -1,4 +1,4 @@
<div class="events"> <div class="row events">
<div class="col-lg-9"> <div class="col-lg-9">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-calendar-o"></i> [[admin/advanced/events:events]]</div> <div class="panel-heading"><i class="fa fa-calendar-o"></i> [[admin/advanced/events:events]]</div>

2
src/views/admin/advanced/logs.tpl
Unescape Escape View File

@ -1,4 +1,4 @@
<div class="logs"> <div class="row logs">
<div class="col-lg-9"> <div class="col-lg-9">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"><i class="fa fa-file-text-o"></i> [[admin/advanced/logs:logs]]</div> <div class="panel-heading"><i class="fa fa-file-text-o"></i> [[admin/advanced/logs:logs]]</div>

2
src/views/admin/appearance/skins.tpl
Unescape Escape View File

@ -1,4 +1,4 @@
<div id="skins" class="row skins"> <div id="skins" class="skins">
<div class="directory row" id="bootstrap_themes"> <div class="directory row" id="bootstrap_themes">
<i class="fa fa-refresh fa-spin"></i> [[admin/appearance/skins:loading]] <i class="fa fa-refresh fa-spin"></i> [[admin/appearance/skins:loading]]
</div> </div>

2
src/views/admin/development/logger.tpl
Unescape Escape View File

@ -1,4 +1,4 @@
<div class="logger"> <div class="row logger">
<div class="col-lg-9"> <div class="col-lg-9">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">[[admin/development/logger:logger-settings]]</div> <div class="panel-heading">[[admin/development/logger:logger-settings]]</div>

2
src/views/admin/extend/rewards.tpl
Unescape Escape View File

@ -1,4 +1,4 @@
<div id="rewards"> <div id="rewards" class="row">
<div class="col-lg-9"> <div class="col-lg-9">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading">[[admin/extend/rewards:rewards]]</div> <div class="panel-heading">[[admin/extend/rewards:rewards]]</div>

2
src/views/admin/general/navigation.tpl
Unescape Escape View File

@ -1,4 +1,4 @@
<div id="navigation"> <div class="row" id="navigation">
<div class="col-lg-9"> <div class="col-lg-9">
<div class="clearfix"> <div class="clearfix">
<ul id="active-navigation" class="nav navbar-nav"> <ul id="active-navigation" class="nav navbar-nav">

2
src/views/admin/general/social.tpl
Unescape Escape View File

@ -1,4 +1,4 @@
<div class="social settings" class="row"> <div class="social settings">
<form role="form"> <form role="form">
<div class="row"> <div class="row">
<div class="col-sm-2 col-xs-12 settings-header">[[admin/general/social:post-sharing]]</div> <div class="col-sm-2 col-xs-12 settings-header">[[admin/general/social:post-sharing]]</div>

2
src/views/admin/general/sounds.tpl
Unescape Escape View File

@ -1,4 +1,4 @@
<div class="sounds settings" class="row"> <div class="sounds settings row">
<div class="col-xs-12"> <div class="col-xs-12">
<form role="form"> <form role="form">
<div class="row"> <div class="row">

3
src/views/admin/manage/flags.tpl
Unescape Escape View File

@ -1,5 +1,4 @@
<div class="flags"> <div class="row flags">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="text-center"> <div class="text-center">

2
src/views/admin/manage/ip-blacklist.tpl
Unescape Escape View File

@ -1,4 +1,4 @@
<div class="flags"> <div class="row ip-blacklist">
<div class="col-lg-12"> <div class="col-lg-12">
<p class="lead"> <p class="lead">
[[admin/manage/ip-blacklist:lead]] [[admin/manage/ip-blacklist:lead]]

18
src/views/admin/manage/registration.tpl
Unescape Escape View File

@ -1,4 +1,6 @@
<div class="registration panel panel-primary"> <div class="row">
<div class="col-xs-12">
<div class="registration panel panel-primary">
<div class="panel-heading"> <div class="panel-heading">
[[admin/manage/registration:queue]] [[admin/manage/registration:queue]]
</div> </div>
@ -9,6 +11,7 @@
<!-- ENDIF !users.length --> <!-- ENDIF !users.length -->
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped users-list"> <table class="table table-striped users-list">
<thead>
<tr> <tr>
<th>[[admin/manage/registration:list.name]]</th> <th>[[admin/manage/registration:list.name]]</th>
<th>[[admin/manage/registration:list.email]]</th> <th>[[admin/manage/registration:list.email]]</th>
@ -19,6 +22,8 @@
<!-- END customHeaders --> <!-- END customHeaders -->
<th></th> <th></th>
</tr> </tr>
</thead>
<tbody>
<!-- BEGIN users --> <!-- BEGIN users -->
<tr data-username="{users.username}"> <tr data-username="{users.username}">
<td> <td>
@ -70,13 +75,14 @@
</td> </td>
</tr> </tr>
<!-- END users --> <!-- END users -->
</tbody>
</table> </table>
</div> </div>
<!-- IMPORT partials/paginator.tpl --> <!-- IMPORT partials/paginator.tpl -->
</div> </div>
<div class="invitations panel panel-success"> <div class="invitations panel panel-success">
<div class="panel-heading"> <div class="panel-heading">
[[admin/manage/registration:invitations]] [[admin/manage/registration:invitations]]
</div> </div>
@ -85,11 +91,14 @@
</p> </p>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped invites-list"> <table class="table table-striped invites-list">
<thead>
<tr> <tr>
<th>[[admin/manage/registration:invitations.inviter-username]]</th> <th>[[admin/manage/registration:invitations.inviter-username]]</th>
<th>[[admin/manage/registration:invitations.invitee-email]]</th> <th>[[admin/manage/registration:invitations.invitee-email]]</th>
<th>[[admin/manage/registration:invitations.invitee-username]]</th> <th>[[admin/manage/registration:invitations.invitee-username]]</th>
</tr> </tr>
</thead>
<tbody>
<!-- BEGIN invites --> <!-- BEGIN invites -->
<!-- BEGIN invites.invitations --> <!-- BEGIN invites.invitations -->
<tr data-invitation-mail="{invites.invitations.email}" <tr data-invitation-mail="{invites.invitations.email}"
@ -104,6 +113,9 @@
</tr> </tr>
<!-- END invites.invitations --> <!-- END invites.invitations -->
<!-- END invites --> <!-- END invites -->
</tbody>
</table> </table>
</div> </div>
</div>
</div>
</div> </div>

2
src/views/admin/manage/tags.tpl
Unescape Escape View File

@ -1,5 +1,4 @@
<div class="tags row"> <div class="tags row">
<div class="col-lg-9"> <div class="col-lg-9">
<div class="panel panel-default tag-management"> <div class="panel panel-default tag-management">
<div class="panel-body"> <div class="panel-body">
@ -76,5 +75,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>

4
src/views/admin/manage/users.tpl
Unescape Escape View File

@ -71,6 +71,7 @@
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped users-table"> <table class="table table-striped users-table">
<thead>
<tr> <tr>
<th><input component="user/select/all" type="checkbox"/></th> <th><input component="user/select/all" type="checkbox"/></th>
<th>[[admin/manage/users:users.uid]]</th> <th>[[admin/manage/users:users.uid]]</th>
@ -83,6 +84,8 @@
<th>[[admin/manage/users:users.last-online]]</th> <th>[[admin/manage/users:users.last-online]]</th>
<th>[[admin/manage/users:users.banned]]</th> <th>[[admin/manage/users:users.banned]]</th>
</tr> </tr>
</thead>
<tbody>
<!-- BEGIN users --> <!-- BEGIN users -->
<tr class="user-row"> <tr class="user-row">
<th><input component="user/select/single" data-uid="{users.uid}" type="checkbox"/></th> <th><input component="user/select/single" data-uid="{users.uid}" type="checkbox"/></th>
@ -102,6 +105,7 @@
<td class="text-center"><i class="ban fa fa-gavel text-danger<!-- IF !users.banned --> hidden<!-- ENDIF !users.banned -->"></i></td> <td class="text-center"><i class="ban fa fa-gavel text-danger<!-- IF !users.banned --> hidden<!-- ENDIF !users.banned -->"></i></td>
</tr> </tr>
<!-- END users --> <!-- END users -->
</tbody>
</table> </table>
</div> </div>

8
src/views/admin/partials/categories/privileges.tpl
Unescape Escape View File

@ -1,4 +1,5 @@
<table class="table table-striped privilege-table"> <table class="table table-striped privilege-table">
<thead>
<tr class="privilege-table-header"> <tr class="privilege-table-header">
<th colspan="2"></th> <th colspan="2"></th>
<th class="arrowed" colspan="3"> <th class="arrowed" colspan="3">
@ -17,6 +18,8 @@
<th class="text-center">{privileges.labels.users.name}</th> <th class="text-center">{privileges.labels.users.name}</th>
<!-- END privileges.labels.users --> <!-- END privileges.labels.users -->
</tr> </tr>
</thead>
<tbody>
<!-- IF privileges.users.length --> <!-- IF privileges.users.length -->
<!-- BEGIN privileges.users --> <!-- BEGIN privileges.users -->
<tr data-uid="{privileges.users.uid}"> <tr data-uid="{privileges.users.uid}">
@ -48,9 +51,11 @@
</td> </td>
</tr> </tr>
<!-- ENDIF privileges.users.length --> <!-- ENDIF privileges.users.length -->
</tbody>
</table> </table>
<table class="table table-striped privilege-table"> <table class="table table-striped privilege-table">
<thead>
<tr class="privilege-table-header"> <tr class="privilege-table-header">
<th colspan="2"></th> <th colspan="2"></th>
<th class="arrowed" colspan="3"> <th class="arrowed" colspan="3">
@ -69,6 +74,8 @@
<th class="text-center">{privileges.labels.groups.name}</th> <th class="text-center">{privileges.labels.groups.name}</th>
<!-- END privileges.labels.groups --> <!-- END privileges.labels.groups -->
</tr> </tr>
</thead>
<tbody>
<!-- BEGIN privileges.groups --> <!-- BEGIN privileges.groups -->
<tr data-group-name="{privileges.groups.name}" data-private="<!-- IF privileges.groups.isPrivate -->1<!-- ELSE -->0<!-- ENDIF privileges.groups.isPrivate -->"> <tr data-group-name="{privileges.groups.name}" data-private="<!-- IF privileges.groups.isPrivate -->1<!-- ELSE -->0<!-- ENDIF privileges.groups.isPrivate -->">
<td> <td>
@ -96,6 +103,7 @@
</div> </div>
</td> </td>
</tr> </tr>
</tbody>
</table> </table>
<div class="help-block"> <div class="help-block">
[[admin/manage/categories:privileges.inherit]] [[admin/manage/categories:privileges.inherit]]

Write Preview
Loading…
Cancel
Save